dependencies Update digitaltwins api version to 2020-12-01 (#16044)

* `dependencies` Update `digitaltwins` api version to 2020-12-01 * Add new required property authenticationType with keyBased * Change update to set future due to new api update * Update error message Co-authored-by: catriona-m <[email protected]> Co-authored-by: catriona-m <[email protected]>
hashicorp · Mar 30, 2022 · eedcc0b · eedcc0b
1 parent 0442ba1
commit eedcc0b
Show file tree

Hide file tree

Showing 17 changed files with 1,184 additions and 67 deletions.
diff --git a/internal/services/digitaltwins/client/client.go b/internal/services/digitaltwins/client/client.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-10-31/digitaltwins"
+	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-12-01/digitaltwins"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 )
 

diff --git a/internal/services/digitaltwins/digital_twins_endpoint_eventgrid_resource.go b/internal/services/digitaltwins/digital_twins_endpoint_eventgrid_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-10-31/digitaltwins"
+	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-12-01/digitaltwins"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/parse"
@@ -105,11 +105,12 @@ func resourceDigitalTwinsEndpointEventGridCreateUpdate(d *pluginsdk.ResourceData
 
 	properties := digitaltwins.EndpointResource{
 		Properties: &digitaltwins.EventGrid{
-			EndpointType:     digitaltwins.EndpointTypeEventGrid,
-			TopicEndpoint:    utils.String(d.Get("eventgrid_topic_endpoint").(string)),
-			AccessKey1:       utils.String(d.Get("eventgrid_topic_primary_access_key").(string)),
-			AccessKey2:       utils.String(d.Get("eventgrid_topic_secondary_access_key").(string)),
-			DeadLetterSecret: utils.String(d.Get("dead_letter_storage_secret").(string)),
+			EndpointType:       digitaltwins.EndpointTypeEventGrid,
+			AuthenticationType: digitaltwins.KeyBased,
+			TopicEndpoint:      utils.String(d.Get("eventgrid_topic_endpoint").(string)),
+			AccessKey1:         utils.String(d.Get("eventgrid_topic_primary_access_key").(string)),
+			AccessKey2:         utils.String(d.Get("eventgrid_topic_secondary_access_key").(string)),
+			DeadLetterSecret:   utils.String(d.Get("dead_letter_storage_secret").(string)),
 		},
 	}
 

diff --git a/internal/services/digitaltwins/digital_twins_endpoint_eventhub_resource.go b/internal/services/digitaltwins/digital_twins_endpoint_eventhub_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-10-31/digitaltwins"
+	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-12-01/digitaltwins"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/parse"
@@ -103,6 +103,7 @@ func resourceDigitalTwinsEndpointEventHubCreateUpdate(d *pluginsdk.ResourceData,
 	properties := digitaltwins.EndpointResource{
 		Properties: &digitaltwins.EventHub{
 			EndpointType:                 digitaltwins.EndpointTypeEventHub,
+			AuthenticationType:           digitaltwins.KeyBased,
 			ConnectionStringPrimaryKey:   utils.String(d.Get("eventhub_primary_connection_string").(string)),
 			ConnectionStringSecondaryKey: utils.String(d.Get("eventhub_secondary_connection_string").(string)),
 			DeadLetterSecret:             utils.String(d.Get("dead_letter_storage_secret").(string)),

diff --git a/internal/services/digitaltwins/digital_twins_endpoint_servicebus_resource.go b/internal/services/digitaltwins/digital_twins_endpoint_servicebus_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-10-31/digitaltwins"
+	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-12-01/digitaltwins"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/digitaltwins/parse"
@@ -103,6 +103,7 @@ func resourceDigitalTwinsEndpointServiceBusCreateUpdate(d *pluginsdk.ResourceDat
 	properties := digitaltwins.EndpointResource{
 		Properties: &digitaltwins.ServiceBus{
 			EndpointType:              digitaltwins.EndpointTypeServiceBus,
+			AuthenticationType:        digitaltwins.KeyBased,
 			PrimaryConnectionString:   utils.String(d.Get("servicebus_primary_connection_string").(string)),
 			SecondaryConnectionString: utils.String(d.Get("servicebus_secondary_connection_string").(string)),
 			DeadLetterSecret:          utils.String(d.Get("dead_letter_storage_secret").(string)),

diff --git a/internal/services/digitaltwins/digital_twins_instance_resource.go b/internal/services/digitaltwins/digital_twins_instance_resource.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-10-31/digitaltwins"
+	"github.com/Azure/azure-sdk-for-go/services/digitaltwins/mgmt/2020-12-01/digitaltwins"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
@@ -149,8 +149,13 @@ func resourceDigitalTwinsInstanceUpdate(d *pluginsdk.ResourceData, meta interfac
 		props.Tags = tags.Expand(d.Get("tags").(map[string]interface{}))
 	}
 
-	if _, err := client.Update(ctx, id.ResourceGroup, id.Name, props); err != nil {
-		return fmt.Errorf("updating Digital Twins Instance %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
+	future, err := client.Update(ctx, id.ResourceGroup, id.Name, props)
+	if err != nil {
+		return fmt.Errorf("updating %s: %+v", *id, err)
+	}
+
+	if err := future.WaitForCompletionRef(ctx, client.Client); err != nil {
+		return fmt.Errorf("waiting for update of %s: %+v", *id, err)
 	}
 
 	return resourceDigitalTwinsInstanceRead(d, meta)

diff --git a/...mgmt/2020-10-31/digitaltwins/CHANGELOG.md → ...mgmt/2020-12-01/digitaltwins/CHANGELOG.md b/...mgmt/2020-10-31/digitaltwins/CHANGELOG.md → ...mgmt/2020-12-01/digitaltwins/CHANGELOG.md
diff --git a/...s/mgmt/2020-10-31/digitaltwins/_meta.json → ...s/mgmt/2020-12-01/digitaltwins/_meta.json b/...s/mgmt/2020-10-31/digitaltwins/_meta.json → ...s/mgmt/2020-12-01/digitaltwins/_meta.json
diff --git a/...ns/mgmt/2020-10-31/digitaltwins/client.go → ...ns/mgmt/2020-12-01/digitaltwins/client.go b/...ns/mgmt/2020-10-31/digitaltwins/client.go → ...ns/mgmt/2020-12-01/digitaltwins/client.go
diff --git a/...t/2020-10-31/digitaltwins/digitaltwins.go → ...t/2020-12-01/digitaltwins/digitaltwins.go b/...t/2020-10-31/digitaltwins/digitaltwins.go → ...t/2020-12-01/digitaltwins/digitaltwins.go
diff --git a/.../mgmt/2020-10-31/digitaltwins/endpoint.go → .../mgmt/2020-12-01/digitaltwins/endpoint.go b/.../mgmt/2020-10-31/digitaltwins/endpoint.go → .../mgmt/2020-12-01/digitaltwins/endpoint.go