Skip to content

Commit

Permalink
Merge pull request hashicorp#24005 from hashicorp/refactor/consolidat…
Browse files Browse the repository at this point in the history 
…ing-storagecaches-sdk

refactor: consolidating `azuremanagedlustrefilesystem` and `hpccache` into `storagecache`
  • Loading branch information
@tombuildsstuff
tombuildsstuff authored Nov 23, 2023
2 parents 1ce2cbd + 4f67664 commit 03824fc
Show file tree
Hide file tree
Showing 107 changed files with 208 additions and 4,153 deletions.
6 changes: 0 additions & 6 deletions .github/labeler-issue-triage.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ service/automation:
service/azure-stack-hci:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_stack_hci_cluster((.|\n)*)###'

service/azuremanagedlustrefilesystem:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_managed_lustre_file_system((.|\n)*)###'

service/batch:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_batch_((.|\n)*)###'

Expand Down Expand Up @@ -159,9 +156,6 @@ service/hdinsight:
service/healthcare:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_healthcare_((.|\n)*)###'

service/hpc-cache:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_hpc_cache((.|\n)*)###'

service/hsm:
- '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_dedicated_hardware_security_module((.|\n)*)###'

Expand Down
6 changes: 0 additions & 6 deletions .github/labeler-pull-request-triage.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ service/automation:
service/azure-stack-hci:
- internal/services/azurestackhci/**/*

service/azuremanagedlustrefilesystem:
- internal/services/azuremanagedlustrefilesystem/**/*

service/batch:
- internal/services/batch/**/*

Expand Down Expand Up @@ -161,9 +158,6 @@ service/hdinsight:
service/healthcare:
- internal/services/healthcare/**/*

service/hpc-cache:
- internal/services/hpccache/**/*

service/hsm:
- internal/services/hsm/**/*

Expand Down
3 changes: 1 addition & 2 deletions .teamcity/components/generated/services.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ var services = mapOf(
"authorization" to "Authorization",
"automanage" to "Automanage",
"automation" to "Automation",
"azuremanagedlustrefilesystem" to "Azure Managed Lustre File System",
"azurestackhci" to "Azure Stack HCI",
"batch" to "Batch",
"billing" to "Billing",
Expand Down Expand Up @@ -57,7 +56,6 @@ var services = mapOf(
"frontdoor" to "FrontDoor",
"graphservices" to "Graph Services",
"hdinsight" to "HDInsight",
"hpccache" to "HPC Cache",
"hsm" to "Hardware Security Module",
"healthcare" to "Health Care",
"hybridcompute" to "Hybrid Compute",
Expand Down Expand Up @@ -119,6 +117,7 @@ var services = mapOf(
"signalr" to "SignalR",
"springcloud" to "Spring Cloud",
"storage" to "Storage",
"storagecache" to "Storage Cache",
"storagemover" to "Storage Mover",
"streamanalytics" to "Stream Analytics",
"subscription" to "Subscription",
Expand Down
255 changes: 125 additions & 130 deletions internal/clients/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import (
authorization "github.com/hashicorp/terraform-provider-azurerm/internal/services/authorization/client"
automanage "github.com/hashicorp/terraform-provider-azurerm/internal/services/automanage/client"
automation "github.com/hashicorp/terraform-provider-azurerm/internal/services/automation/client"
azureManagedLustreFileSystem "github.com/hashicorp/terraform-provider-azurerm/internal/services/azuremanagedlustrefilesystem/client"
azureStackHCI "github.com/hashicorp/terraform-provider-azurerm/internal/services/azurestackhci/client"
batch "github.com/hashicorp/terraform-provider-azurerm/internal/services/batch/client"
blueprints "github.com/hashicorp/terraform-provider-azurerm/internal/services/blueprints/client"
Expand Down Expand Up @@ -76,7 +75,6 @@ import (
graph "github.com/hashicorp/terraform-provider-azurerm/internal/services/graphservices/client"
hdinsight "github.com/hashicorp/terraform-provider-azurerm/internal/services/hdinsight/client"
healthcare "github.com/hashicorp/terraform-provider-azurerm/internal/services/healthcare/client"
hpccache "github.com/hashicorp/terraform-provider-azurerm/internal/services/hpccache/client"
hsm "github.com/hashicorp/terraform-provider-azurerm/internal/services/hsm/client"
hybridcompute "github.com/hashicorp/terraform-provider-azurerm/internal/services/hybridcompute/client"
iotcentral "github.com/hashicorp/terraform-provider-azurerm/internal/services/iotcentral/client"
Expand Down Expand Up @@ -136,6 +134,7 @@ import (
appPlatform "github.com/hashicorp/terraform-provider-azurerm/internal/services/springcloud/client"
sql "github.com/hashicorp/terraform-provider-azurerm/internal/services/sql/client"
storage "github.com/hashicorp/terraform-provider-azurerm/internal/services/storage/client"
storageCache "github.com/hashicorp/terraform-provider-azurerm/internal/services/storagecache/client"
storageMover "github.com/hashicorp/terraform-provider-azurerm/internal/services/storagemover/client"
streamAnalytics "github.com/hashicorp/terraform-provider-azurerm/internal/services/streamanalytics/client"
subscription "github.com/hashicorp/terraform-provider-azurerm/internal/services/subscription/client"
Expand All @@ -156,128 +155,127 @@ type Client struct {
Account *ResourceManagerAccount
Features features.UserFeatures

AadB2c *aadb2c_v2021_04_01_preview.Client
Advisor *advisor.Client
AnalysisServices *analysisservices_v2017_08_01.Client
ApiManagement *apiManagement.Client
AppConfiguration *appConfiguration.Client
AppInsights *applicationInsights.Client
AppPlatform *appPlatform.Client
AppService *appService.Client
ArcKubernetes *arckubernetes.Client
ArcResourceBridge *arcResourceBridge.Client
Attestation *attestation.Client
Authorization *authorization.Client
Automanage *automanage.Client
Automation *automation.Client
AzureManagedLustreFileSystem *storagecache_2023_05_01.Client
AzureStackHCI *azurestackhci_v2023_08_01.Client
Batch *batch.Client
Blueprints *blueprints.Client
Bot *bot.Client
Cdn *cdn.Client
Cognitive *cognitiveServices.Client
Communication *communication.Client
Compute *compute.Client
ConfidentialLedger *confidentialledger.Client
Connections *connections.Client
Consumption *consumption.Client
ContainerApps *containerapps.Client
Containers *containerServices.Client
Cosmos *cosmosdb.Client
CostManagement *costmanagement.Client
CustomProviders *customproviders.Client
Dashboard *dashboard.Client
DatabaseMigration *datamigration.Client
DataBricks *databricks.Client
DataboxEdge *databoxedge.Client
Datadog *datadog_v2021_03_01.Client
DataFactory *datafactory.Client
DataProtection *dataprotection.Client
DataShare *datashare.Client
DesktopVirtualization *desktopvirtualization.Client
DevTestLabs *devtestlabs.Client
DigitalTwins *digitaltwins.Client
Disks *disks.Client
Dns *dns_v2018_05_01.Client
DomainServices *domainservices.Client
Elastic *elastic.Client
EventGrid *eventgrid_v2022_06_15.Client
Eventhub *eventhub.Client
Firewall *firewall.Client
FluidRelay *fluidrelay_2022_05_26.Client
Frontdoor *frontdoor.Client
Graph *graph.Client
HPCCache *hpccache.Client
HSM *hsm.Client
HDInsight *hdinsight.Client
HybridCompute *hybridcompute.Client
HealthCare *healthcare.Client
IoTCentral *iotcentral.Client
IoTHub *iothub.Client
IoTTimeSeriesInsights *timeseriesinsights_v2020_05_15.Client
KeyVault *keyvault.Client
Kusto *kusto.Client
LabService *labservice.Client
Legacy *legacy.Client
Lighthouse *lighthouse.Client
LoadBalancers *loadbalancers.Client
LogAnalytics *loganalytics.Client
Logic *logic.Client
Logz *logz.Client
MachineLearning *machinelearning.Client
Maintenance *maintenance.Client
ManagedApplication *managedapplication.Client
ManagementGroups *managementgroup.Client
Maps *maps.Client
MariaDB *mariadb.Client
Media *media.Client
MixedReality *mixedreality.Client
Monitor *monitor.Client
MobileNetwork *mobilenetwork.Client
MSSQL *mssql.Client
MSSQLManagedInstance *mssqlmanagedinstance.Client
MySQL *mysql.Client
NetApp *netapp.Client
Network *network.Client
NetworkFunction *networkfunction.Client
NewRelic *newrelic.Client
Nginx *nginx2.Client
NotificationHubs *notificationhub.Client
Orbital *orbital.Client
PaloAlto *paloalto.Client
Policy *policy.Client
Portal *portal.Client
Postgres *postgres.Client
PowerBI *powerBI.Client
PrivateDns *privatedns.Client
PrivateDnsResolver *dnsresolver.Client
Purview *purview.Client
RecoveryServices *recoveryServices.Client
Redis *redis_2023_08_01.Client
RedisEnterprise *redisenterprise.Client
Relay *relay.Client
Resource *resource.Client
Search *search.Client
SecurityCenter *securityCenter.Client
Sentinel *sentinel.Client
ServiceBus *serviceBus.Client
ServiceConnector *serviceConnector.Client
ServiceFabric *serviceFabric.Client
ServiceFabricManaged *serviceFabricManaged.Client
ServiceNetworking *servicenetworking_v2023_05_01_preview.Client
SignalR *signalr.Client
Storage *storage.Client
StorageMover *storageMover.Client
StreamAnalytics *streamAnalytics.Client
Subscription *subscription.Client
Sql *sql.Client
Synapse *synapse.Client
TrafficManager *trafficManager.Client
VideoAnalyzer *videoAnalyzer.Client
Vmware *vmware.Client
VoiceServices *voiceServices.Client
Web *web.Client
AadB2c *aadb2c_v2021_04_01_preview.Client
Advisor *advisor.Client
AnalysisServices *analysisservices_v2017_08_01.Client
ApiManagement *apiManagement.Client
AppConfiguration *appConfiguration.Client
AppInsights *applicationInsights.Client
AppPlatform *appPlatform.Client
AppService *appService.Client
ArcKubernetes *arckubernetes.Client
ArcResourceBridge *arcResourceBridge.Client
Attestation *attestation.Client
Authorization *authorization.Client
Automanage *automanage.Client
Automation *automation.Client
AzureStackHCI *azurestackhci_v2023_08_01.Client
Batch *batch.Client
Blueprints *blueprints.Client
Bot *bot.Client
Cdn *cdn.Client
Cognitive *cognitiveServices.Client
Communication *communication.Client
Compute *compute.Client
ConfidentialLedger *confidentialledger.Client
Connections *connections.Client
Consumption *consumption.Client
ContainerApps *containerapps.Client
Containers *containerServices.Client
Cosmos *cosmosdb.Client
CostManagement *costmanagement.Client
CustomProviders *customproviders.Client
Dashboard *dashboard.Client
DatabaseMigration *datamigration.Client
DataBricks *databricks.Client
DataboxEdge *databoxedge.Client
Datadog *datadog_v2021_03_01.Client
DataFactory *datafactory.Client
DataProtection *dataprotection.Client
DataShare *datashare.Client
DesktopVirtualization *desktopvirtualization.Client
DevTestLabs *devtestlabs.Client
DigitalTwins *digitaltwins.Client
Disks *disks.Client
Dns *dns_v2018_05_01.Client
DomainServices *domainservices.Client
Elastic *elastic.Client
EventGrid *eventgrid_v2022_06_15.Client
Eventhub *eventhub.Client
Firewall *firewall.Client
FluidRelay *fluidrelay_2022_05_26.Client
Frontdoor *frontdoor.Client
Graph *graph.Client
HSM *hsm.Client
HDInsight *hdinsight.Client
HybridCompute *hybridcompute.Client
HealthCare *healthcare.Client
IoTCentral *iotcentral.Client
IoTHub *iothub.Client
IoTTimeSeriesInsights *timeseriesinsights_v2020_05_15.Client
KeyVault *keyvault.Client
Kusto *kusto.Client
LabService *labservice.Client
Legacy *legacy.Client
Lighthouse *lighthouse.Client
LoadBalancers *loadbalancers.Client
LogAnalytics *loganalytics.Client
Logic *logic.Client
Logz *logz.Client
MachineLearning *machinelearning.Client
Maintenance *maintenance.Client
ManagedApplication *managedapplication.Client
ManagementGroups *managementgroup.Client
Maps *maps.Client
MariaDB *mariadb.Client
Media *media.Client
MixedReality *mixedreality.Client
Monitor *monitor.Client
MobileNetwork *mobilenetwork.Client
MSSQL *mssql.Client
MSSQLManagedInstance *mssqlmanagedinstance.Client
MySQL *mysql.Client
NetApp *netapp.Client
Network *network.Client
NetworkFunction *networkfunction.Client
NewRelic *newrelic.Client
Nginx *nginx2.Client
NotificationHubs *notificationhub.Client
Orbital *orbital.Client
PaloAlto *paloalto.Client
Policy *policy.Client
Portal *portal.Client
Postgres *postgres.Client
PowerBI *powerBI.Client
PrivateDns *privatedns.Client
PrivateDnsResolver *dnsresolver.Client
Purview *purview.Client
RecoveryServices *recoveryServices.Client
Redis *redis_2023_08_01.Client
RedisEnterprise *redisenterprise.Client
Relay *relay.Client
Resource *resource.Client
Search *search.Client
SecurityCenter *securityCenter.Client
Sentinel *sentinel.Client
ServiceBus *serviceBus.Client
ServiceConnector *serviceConnector.Client
ServiceFabric *serviceFabric.Client
ServiceFabricManaged *serviceFabricManaged.Client
ServiceNetworking *servicenetworking_v2023_05_01_preview.Client
SignalR *signalr.Client
Storage *storage.Client
StorageCache *storagecache_2023_05_01.Client
StorageMover *storageMover.Client
StreamAnalytics *streamAnalytics.Client
Subscription *subscription.Client
Sql *sql.Client
Synapse *synapse.Client
TrafficManager *trafficManager.Client
VideoAnalyzer *videoAnalyzer.Client
Vmware *vmware.Client
VoiceServices *voiceServices.Client
Web *web.Client
}

// NOTE: it should be possible for this method to become Private once the top level Client's removed
Expand Down Expand Up @@ -334,9 +332,6 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
if client.Automation, err = automation.NewClient(o); err != nil {
return fmt.Errorf("building clients for Automation: %+v", err)
}
if client.AzureManagedLustreFileSystem, err = azureManagedLustreFileSystem.NewClient(o); err != nil {
return fmt.Errorf("building clients for Azure Managed Lustre File System: %+v", err)
}
if client.AzureStackHCI, err = azureStackHCI.NewClient(o); err != nil {
return fmt.Errorf("building clients for AzureStackHCI: %+v", err)
}
Expand Down Expand Up @@ -440,9 +435,6 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
if client.Graph, err = graph.NewClient(o); err != nil {
return fmt.Errorf("building clients for Graph: %+v", err)
}
if client.HPCCache, err = hpccache.NewClient(o); err != nil {
return fmt.Errorf("building clients for HPC Cache: %+v", err)
}
if client.HSM, err = hsm.NewClient(o); err != nil {
return fmt.Errorf("building clients for HSM: %+v", err)
}
Expand Down Expand Up @@ -595,6 +587,9 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
if client.Storage, err = storage.NewClient(o); err != nil {
return fmt.Errorf("building clients for StorageMover: %+v", err)
}
if client.StorageCache, err = storageCache.NewClient(o); err != nil {
return fmt.Errorf("building clients for Storage Cache: %+v", err)
}
if client.StorageMover, err = storageMover.NewClient(o); err != nil {
return fmt.Errorf("building Storage for StorageMover: %+v", err)
}
Expand Down
Loading

0 comments on commit 03824fc

Please sign in to comment.