Skip to content

Commit

Permalink
Upgrade terraform-provider-azurerm to v4.2.0 (#2487)
Browse files Browse the repository at this point in the history
This PR was generated via `$ upgrade-provider pulumi/pulumi-azure
--upstream-provider-name=terraform-provider-azurerm --kind=provider
--target-version=4.2.0`.

---

- Upgrading terraform-provider-azurerm from 4.1.0  to 4.2.0.
	Fixes #2394
	Fixes #2379
	Fixes #2349
  • Loading branch information
danielrbradley committed Sep 27, 2024
1 parent ce47ccc commit b7ccc7a
Show file tree
Hide file tree
Showing 93 changed files with 3,918 additions and 3,491 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ Subject: [PATCH] Ensure servicebus queue & topic have namespaces and RG names
These are computed attributes for use in the servicebus mixins in Pulumi.

diff --git a/internal/services/servicebus/servicebus_queue_resource.go b/internal/services/servicebus/servicebus_queue_resource.go
index 579c5712ce..cc468319b5 100644
index b4df3f33be..fc4838204d 100644
--- a/internal/services/servicebus/servicebus_queue_resource.go
+++ b/internal/services/servicebus/servicebus_queue_resource.go
@@ -47,6 +47,8 @@ func resourceServiceBusQueue() *pluginsdk.Resource {
@@ -46,6 +46,8 @@ func resourceServiceBusQueue() *pluginsdk.Resource {
}
}

+// FORK: @stack72: Ensured the ResourceGroupName and NamespaceName was available as a computed attribute for use
+// in the servicebus mixins in Pulumi
func resourceServicebusQueueSchema() map[string]*pluginsdk.Schema {
schema := map[string]*pluginsdk.Schema{
return map[string]*pluginsdk.Schema{
"name": {
@@ -165,6 +167,16 @@ func resourceServicebusQueueSchema() map[string]*pluginsdk.Schema {
@@ -166,6 +168,16 @@ func resourceServicebusQueueSchema() map[string]*pluginsdk.Schema {
ForceNew: true,
},

Expand All @@ -36,7 +36,7 @@ index 579c5712ce..cc468319b5 100644
"status": {
Type: pluginsdk.TypeString,
Optional: true,
@@ -480,6 +492,8 @@ func resourceServiceBusQueueRead(d *pluginsdk.ResourceData, meta interface{}) er
@@ -377,6 +389,8 @@ func resourceServiceBusQueueRead(d *pluginsdk.ResourceData, meta interface{}) er

d.Set("name", id.QueueName)
d.Set("namespace_id", namespaceId.ID())
Expand Down
2 changes: 1 addition & 1 deletion patches/0013-Update-documentation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2484,7 +2484,7 @@ index 1e67c40d11..97e4bc8354 100644
}

diff --git a/website/docs/r/servicebus_queue.html.markdown b/website/docs/r/servicebus_queue.html.markdown
index 82dfc08917..14bf56bf55 100644
index 686b756107..f209e721bc 100644
--- a/website/docs/r/servicebus_queue.html.markdown
+++ b/website/docs/r/servicebus_queue.html.markdown
@@ -14,7 +14,7 @@ Manages a ServiceBus Queue.
Expand Down
27 changes: 8 additions & 19 deletions provider/cmd/pulumi-resource-azure/bridge-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -1815,6 +1815,14 @@
}
}
},
"azurerm_arc_machine": {
"current": "azure:arcmachine/arcMachine:ArcMachine",
"majorVersion": 6
},
"azurerm_arc_machine_automanage_configuration_assignment": {
"current": "azure:arcmachine/automanageConfigurationAssignment:AutomanageConfigurationAssignment",
"majorVersion": 6
},
"azurerm_arc_machine_extension": {
"current": "azure:arcmachine/extension:Extension",
"majorVersion": 6
Expand Down Expand Up @@ -13153,25 +13161,6 @@
"current": "azure:marketplace/roleAssignment:RoleAssignment",
"majorVersion": 6
},
"azurerm_media_services_account_filter": {
"current": "azure:media/accountFilter:AccountFilter",
"majorVersion": 6,
"fields": {
"presentation_time_range": {
"maxItemsOne": true
},
"track_selection": {
"maxItemsOne": false,
"elem": {
"fields": {
"condition": {
"maxItemsOne": false
}
}
}
}
}
},
"azurerm_mobile_network": {
"current": "azure:mobile/network:Network",
"majorVersion": 6
Expand Down
357 changes: 182 additions & 175 deletions provider/cmd/pulumi-resource-azure/schema.json

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ const (
azureMaps = "Maps" // Maps
azureMarketPlace = "Marketplace" // Marketplace
azureMediaServices = "MediaServices" // Media Services
azureMedia = "Media" // Media
azureMixedReality = "MixedReality" // Mixed Reality
azureMonitoring = "Monitoring" // Metrics/monitoring resources
azureMobile = "Mobile" // Mobile
Expand Down Expand Up @@ -301,7 +300,6 @@ var moduleMap = map[string]string{
"maps": azureMaps,
"marketplace": azureMarketPlace,
"media_services": azureMediaServices,
"media": azureMedia,
// Ignored: azureMixedReality. The only token is "azurerm_spatial_anchors_account".
"monitor": azureMonitoring,
"mobile": azureMobile,
Expand Down Expand Up @@ -1561,9 +1559,6 @@ func Provider() tfbridge.ProviderInfo {
"azurerm_maps_account": {Tok: azureResource(azureMaps, "Account")},
"azurerm_maps_creator": {Tok: azureResource(azureMaps, "Creator")},

// Media
"azurerm_media_services_account_filter": {Tok: azureResource(azureMedia, "AccountFilter"), Docs: &info.Doc{AllowMissing: true}},

// Monitoring resources
"azurerm_monitor_action_group": {
Tok: azureResource(azureMonitoring, "ActionGroup"),
Expand Down
184 changes: 184 additions & 0 deletions sdk/dotnet/ArcMachine/ArcMachine.cs

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

Loading

0 comments on commit b7ccc7a

Please sign in to comment.