Merge branch 'main' of github.com:hashicorp/terraform-provider-azurer…

…m into stackhci_network_interface
hashicorp · Nov 7, 2024 · a36ee66 · a36ee66
2 parents 6712bf8 + 5f1c65e
commit a36ee66
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ ENHANCEMENTS:
 
 * dependencies - update `go-azure-sdk` to `v0.20241104.1140654` [GH-27896]
 * dependencies - update `go-azure-helpers` to `v0.71.0` [GH-27897]
+* `azurerm_cognitive_deployment` - `sku.0.name` now supports `DataZoneStandard` [GH-27926]
 * `azurerm_public_ip_prefix` - add support for the `sku_tier` property [GH-27882]
 *  `azurerm_oracle_cloud_vm_cluster` - add support for the `domain`, `scan_listener_port_tcp`, `scan_listener_port_tcp_ssl` and `zone_id` properties [GH-27808]
 *  `azurerm_public_ip` - support for the d`omain_name_label_scope` property [GH-27748]

diff --git a/internal/services/batch/batch_job_resource.go b/internal/services/batch/batch_job_resource.go
@@ -17,7 +17,7 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
 	"github.com/hashicorp/terraform-provider-azurerm/utils"
-	batchDataplane "github.com/tombuildsstuff/kermit/sdk/batch/2022-01.15.0/batch"
+	batchDataplane "github.com/jackofallops/kermit/sdk/batch/2022-01.15.0/batch"
 )
 
 type BatchJobResource struct{}

diff --git a/internal/services/batch/client/client.go b/internal/services/batch/client/client.go
@@ -13,7 +13,7 @@ import (
 	"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2023-05-01/certificate"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2023-05-01/pool"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
-	batchDataplane "github.com/tombuildsstuff/kermit/sdk/batch/2022-01.15.0/batch"
+	batchDataplane "github.com/jackofallops/kermit/sdk/batch/2022-01.15.0/batch"
 )
 
 type Client struct {

diff --git a/internal/services/cognitive/cognitive_deployment_resource.go b/internal/services/cognitive/cognitive_deployment_resource.go
@@ -117,6 +117,7 @@ func (r CognitiveDeploymentResource) Arguments() map[string]*pluginsdk.Schema {
 						ForceNew: true,
 						ValidateFunc: validation.StringInSlice([]string{
 							"Standard",
+							"DataZoneStandard",
 							"GlobalBatch",
 							"GlobalStandard",
 							"ProvisionedManaged",

diff --git a/...t/sdk/batch/2022-01.15.0/batch/account.go → ...t/sdk/batch/2022-01.15.0/batch/account.go b/...t/sdk/batch/2022-01.15.0/batch/account.go → ...t/sdk/batch/2022-01.15.0/batch/account.go
diff --git a/...k/batch/2022-01.15.0/batch/application.go → ...k/batch/2022-01.15.0/batch/application.go b/...k/batch/2022-01.15.0/batch/application.go → ...k/batch/2022-01.15.0/batch/application.go
diff --git a/...k/batch/2022-01.15.0/batch/certificate.go → ...k/batch/2022-01.15.0/batch/certificate.go b/...k/batch/2022-01.15.0/batch/certificate.go → ...k/batch/2022-01.15.0/batch/certificate.go
diff --git a/...it/sdk/batch/2022-01.15.0/batch/client.go → ...it/sdk/batch/2022-01.15.0/batch/client.go b/...it/sdk/batch/2022-01.15.0/batch/client.go → ...it/sdk/batch/2022-01.15.0/batch/client.go
diff --git a/...k/batch/2022-01.15.0/batch/computenode.go → ...k/batch/2022-01.15.0/batch/computenode.go b/...k/batch/2022-01.15.0/batch/computenode.go → ...k/batch/2022-01.15.0/batch/computenode.go
diff --git a/...022-01.15.0/batch/computenodeextension.go → ...022-01.15.0/batch/computenodeextension.go b/...022-01.15.0/batch/computenodeextension.go → ...022-01.15.0/batch/computenodeextension.go
diff --git a/...mit/sdk/batch/2022-01.15.0/batch/enums.go → ...mit/sdk/batch/2022-01.15.0/batch/enums.go b/...mit/sdk/batch/2022-01.15.0/batch/enums.go → ...mit/sdk/batch/2022-01.15.0/batch/enums.go
diff --git a/...rmit/sdk/batch/2022-01.15.0/batch/file.go → ...rmit/sdk/batch/2022-01.15.0/batch/file.go b/...rmit/sdk/batch/2022-01.15.0/batch/file.go → ...rmit/sdk/batch/2022-01.15.0/batch/file.go
diff --git a/...ermit/sdk/batch/2022-01.15.0/batch/job.go → ...ermit/sdk/batch/2022-01.15.0/batch/job.go b/...ermit/sdk/batch/2022-01.15.0/batch/job.go → ...ermit/sdk/batch/2022-01.15.0/batch/job.go
diff --git a/...k/batch/2022-01.15.0/batch/jobschedule.go → ...k/batch/2022-01.15.0/batch/jobschedule.go b/...k/batch/2022-01.15.0/batch/jobschedule.go → ...k/batch/2022-01.15.0/batch/jobschedule.go
diff --git a/...it/sdk/batch/2022-01.15.0/batch/models.go → ...it/sdk/batch/2022-01.15.0/batch/models.go b/...it/sdk/batch/2022-01.15.0/batch/models.go → ...it/sdk/batch/2022-01.15.0/batch/models.go
diff --git a/...rmit/sdk/batch/2022-01.15.0/batch/pool.go → ...rmit/sdk/batch/2022-01.15.0/batch/pool.go b/...rmit/sdk/batch/2022-01.15.0/batch/pool.go → ...rmit/sdk/batch/2022-01.15.0/batch/pool.go
diff --git a/...rmit/sdk/batch/2022-01.15.0/batch/task.go → ...rmit/sdk/batch/2022-01.15.0/batch/task.go b/...rmit/sdk/batch/2022-01.15.0/batch/task.go → ...rmit/sdk/batch/2022-01.15.0/batch/task.go
diff --git a/...t/sdk/batch/2022-01.15.0/batch/version.go → ...t/sdk/batch/2022-01.15.0/batch/version.go b/...t/sdk/batch/2022-01.15.0/batch/version.go → ...t/sdk/batch/2022-01.15.0/batch/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1367,6 +1367,7 @@ github.com/hashicorp/yamux
 ## explicit; go 1.22
 github.com/jackofallops/kermit/sdk/appconfiguration/1.0/appconfiguration
 github.com/jackofallops/kermit/sdk/attestation/2022-08-01/attestation
+github.com/jackofallops/kermit/sdk/batch/2022-01.15.0/batch
 github.com/jackofallops/kermit/sdk/web/2022-09-01/web
 github.com/jackofallops/kermit/version
 # github.com/kr/pretty v0.3.0
@@ -1427,7 +1428,6 @@ github.com/tombuildsstuff/giovanni/storage/internal/metadata
 # github.com/tombuildsstuff/kermit v0.20240122.1123108
 ## explicit; go 1.18
 github.com/tombuildsstuff/kermit/sdk/appplatform/2023-05-01-preview/appplatform
-github.com/tombuildsstuff/kermit/sdk/batch/2022-01.15.0/batch
 github.com/tombuildsstuff/kermit/sdk/botservice/2021-05-01-preview/botservice
 github.com/tombuildsstuff/kermit/sdk/datafactory/2018-06-01/datafactory
 github.com/tombuildsstuff/kermit/sdk/iotcentral/2022-10-31-preview/iotcentral

diff --git a/website/docs/r/cognitive_deployment.html.markdown b/website/docs/r/cognitive_deployment.html.markdown
@@ -72,7 +72,7 @@ A `model` block supports the following:
 
 A `sku` block supports the following:
 
-* `name` - (Required) The name of the SKU. Possible values include `Standard`, `GlobalBatch`, `GlobalStandard` and `ProvisionedManaged`.
+* `name` - (Required) The name of the SKU. Possible values include `Standard`, `DataZoneStandard`, `GlobalBatch`, `GlobalStandard` and `ProvisionedManaged`.
 
 * `tier` - (Optional) Possible values are `Free`, `Basic`, `Standard`, `Premium`, `Enterprise`. Changing this forces a new resource to be created.