Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependencies - update batch to 2022-10-01 #21962

Merged
merged 1 commit into from
Jun 9, 2023
Merged

dependencies - update batch to 2022-10-01 #21962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/services/batch/batch_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package batch
import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/batchaccount"
)

// expandBatchAccountKeyVaultReference expands Batch account KeyVault reference
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_account_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/batchaccount"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/batch/validate"
keyVaultValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/keyvault/validate"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_account_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/batchaccount"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_account_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/batchaccount"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_application_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/application"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/application"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/batch/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_application_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/application"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/application"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_application_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/application"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/application"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_certificate_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/certificate"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/certificate"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/batch/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_certificate_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/certificate"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/certificate"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_certificate_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/certificate"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/certificate"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/batch/batch_job_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"time"

"github.com/Azure/go-autorest/autorest/date"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/pool"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/pool"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/batch/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/batch/validate"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_job_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/batchaccount"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
14 changes: 7 additions & 7 deletions internal/services/batch/batch_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/pool"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/pool"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)
Expand Down Expand Up @@ -369,8 +369,8 @@ func flattenBatchPoolMountConfig(d *pluginsdk.ResourceData, config *pool.MountCo
cifsMountConfigList := make([]interface{}, 0)
cifsMountConfig := make(map[string]interface{})

cifsMountConfig["user_name"] = config.CifsMountConfiguration.Username
cifsMountConfig["password"] = findSensitiveInfoForMountConfig("password", "user_name", config.CifsMountConfiguration.Username, "cifs_mount", d)
cifsMountConfig["user_name"] = config.CifsMountConfiguration.UserName
cifsMountConfig["password"] = findSensitiveInfoForMountConfig("password", "user_name", config.CifsMountConfiguration.UserName, "cifs_mount", d)
cifsMountConfig["source"] = config.CifsMountConfiguration.Source
cifsMountConfig["relative_mount_path"] = config.CifsMountConfiguration.RelativeMountPath

Expand Down Expand Up @@ -1055,7 +1055,7 @@ func expandBatchPoolCIFSMountConfiguration(list []interface{}) (*pool.CIFSMountC

configMap := list[0].(map[string]interface{})
result := pool.CIFSMountConfiguration{
Username: configMap["user_name"].(string),
UserName: configMap["user_name"].(string),
Source: configMap["source"].(string),
Password: configMap["password"].(string),
RelativeMountPath: configMap["relative_mount_path"].(string),
Expand Down Expand Up @@ -1104,7 +1104,7 @@ func ExpandBatchPoolNetworkConfiguration(list []interface{}) (*pool.NetworkConfi
networkConfiguration := &pool.NetworkConfiguration{}

if v, ok := networkConfigValue["dynamic_vnet_assignment_scope"]; ok {
networkConfiguration.DynamicVNetAssignmentScope = pointer.To(pool.DynamicVNetAssignmentScope(v.(string)))
networkConfiguration.DynamicVnetAssignmentScope = pointer.To(pool.DynamicVNetAssignmentScope(v.(string)))
}

if v, ok := networkConfigValue["subnet_id"]; ok {
Expand Down Expand Up @@ -1297,8 +1297,8 @@ func flattenBatchPoolNetworkConfiguration(input *pool.NetworkConfiguration) []in
}

dynamicVNetAssignmentScope := ""
if input.DynamicVNetAssignmentScope != nil {
dynamicVNetAssignmentScope = string(*input.DynamicVNetAssignmentScope)
if input.DynamicVnetAssignmentScope != nil {
dynamicVNetAssignmentScope = string(*input.DynamicVnetAssignmentScope)
}

return []interface{}{
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_pool_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/pool"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/pool"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/batch/validate"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_pool_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/identity"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/pool"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/pool"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/batch/batch_pool_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"testing"

"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/pool"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/pool"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
8 changes: 4 additions & 4 deletions internal/services/batch/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"

"github.com/Azure/go-autorest/autorest"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/application"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/certificate"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-01-01/pool"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/application"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/batchaccount"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/certificate"
"github.com/hashicorp/go-azure-sdk/resource-manager/batch/2022-10-01/pool"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
batchDataplane "github.com/tombuildsstuff/kermit/sdk/batch/2022-01.15.0/batch"
)
Expand Down
10 changes: 0 additions & 10 deletions ...resource-manager/batch/2022-01-01/batchaccount/model_privatelinkserviceconnectionstate.go
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...er/batch/2022-01-01/application/README.md → ...er/batch/2022-10-01/application/README.md
View file
Open in desktop

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

0 ...er/batch/2022-01-01/application/client.go → ...er/batch/2022-10-01/application/client.go
View file
Open in desktop
File renamed without changes.
0 .../2022-01-01/application/id_application.go → .../2022-10-01/application/id_application.go
View file
Open in desktop
File renamed without changes.
0 ...2022-01-01/application/id_batchaccount.go → ...2022-10-01/application/id_batchaccount.go
View file
Open in desktop
File renamed without changes.
0 ...h/2022-01-01/application/method_create.go → ...h/2022-10-01/application/method_create.go
View file
Open in desktop
File renamed without changes.
0 ...h/2022-01-01/application/method_delete.go → ...h/2022-10-01/application/method_delete.go
View file
Open in desktop
File renamed without changes.
0 ...atch/2022-01-01/application/method_get.go → ...atch/2022-10-01/application/method_get.go
View file
Open in desktop
File renamed without changes.
0 ...tch/2022-01-01/application/method_list.go → ...tch/2022-10-01/application/method_list.go
View file
Open in desktop
File renamed without changes.
0 ...h/2022-01-01/application/method_update.go → ...h/2022-10-01/application/method_update.go
View file
Open in desktop
File renamed without changes.
0 ...22-01-01/application/model_application.go → ...22-10-01/application/model_application.go
View file
Open in desktop
File renamed without changes.
0 ...pplication/model_applicationproperties.go → ...pplication/model_applicationproperties.go
View file
Open in desktop
File renamed without changes.
0 ...atch/2022-01-01/application/predicates.go → ...atch/2022-10-01/application/predicates.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...r/batch/2022-01-01/application/version.go → ...r/batch/2022-10-01/application/version.go
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions ...r/batch/2022-01-01/batchaccount/README.md → ...r/batch/2022-10-01/batchaccount/README.md
View file
Open in desktop

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

0 ...r/batch/2022-01-01/batchaccount/client.go → ...r/batch/2022-10-01/batchaccount/client.go
View file
Open in desktop
File renamed without changes.
88 changes: 88 additions & 0 deletions ...atch/2022-01-01/batchaccount/constants.go → ...atch/2022-10-01/batchaccount/constants.go
View file
Open in desktop

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

0 ...022-01-01/batchaccount/id_batchaccount.go → ...022-10-01/batchaccount/id_batchaccount.go
View file
Open in desktop
File renamed without changes.
0 .../2022-01-01/batchaccount/method_create.go → .../2022-10-01/batchaccount/method_create.go
View file
Open in desktop
File renamed without changes.
0 .../2022-01-01/batchaccount/method_delete.go → .../2022-10-01/batchaccount/method_delete.go
View file
Open in desktop
File renamed without changes.
0 ...tch/2022-01-01/batchaccount/method_get.go → ...tch/2022-10-01/batchaccount/method_get.go
View file
Open in desktop
File renamed without changes.
0 ...2022-01-01/batchaccount/method_getkeys.go → ...2022-10-01/batchaccount/method_getkeys.go
View file
Open in desktop
File renamed without changes.
0 ...ch/2022-01-01/batchaccount/method_list.go → ...ch/2022-10-01/batchaccount/method_list.go
View file
Open in desktop
File renamed without changes.
0 ...atchaccount/method_listbyresourcegroup.go → ...atchaccount/method_listbyresourcegroup.go
View file
Open in desktop
File renamed without changes.
0 ...stoutboundnetworkdependenciesendpoints.go → ...stoutboundnetworkdependenciesendpoints.go
View file
Open in desktop
File renamed without changes.
0 ...1-01/batchaccount/method_regeneratekey.go → ...0-01/batchaccount/method_regeneratekey.go
View file
Open in desktop
File renamed without changes.
0 ...ount/method_synchronizeautostoragekeys.go → ...ount/method_synchronizeautostoragekeys.go
View file
Open in desktop
File renamed without changes.
0 .../2022-01-01/batchaccount/method_update.go → .../2022-10-01/batchaccount/method_update.go
View file
Open in desktop
File renamed without changes.
0 ...ccount/model_autostoragebaseproperties.go → ...ccount/model_autostoragebaseproperties.go
View file
Open in desktop
File renamed without changes.
0 ...tchaccount/model_autostorageproperties.go → ...tchaccount/model_autostorageproperties.go
View file
Open in desktop
File renamed without changes.
0 ...-01-01/batchaccount/model_batchaccount.go → ...-10-01/batchaccount/model_batchaccount.go
View file
Open in desktop
File renamed without changes.
0 ...unt/model_batchaccountcreateparameters.go → ...unt/model_batchaccountcreateparameters.go
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...unt/model_batchaccountcreateproperties.go → ...unt/model_batchaccountcreateproperties.go
View file
Open in desktop

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

0 ...01/batchaccount/model_batchaccountkeys.go → ...01/batchaccount/model_batchaccountkeys.go
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions ...chaccount/model_batchaccountproperties.go → ...chaccount/model_batchaccountproperties.go
View file
Open in desktop

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

0 ...el_batchaccountregeneratekeyparameters.go → ...el_batchaccountregeneratekeyparameters.go
View file
Open in desktop
File renamed without changes.
0 ...unt/model_batchaccountupdateparameters.go → ...unt/model_batchaccountupdateparameters.go
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions ...unt/model_batchaccountupdateproperties.go → ...unt/model_batchaccountupdateproperties.go
View file
Open in desktop

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

0 ...unt/model_computenodeidentityreference.go → ...unt/model_computenodeidentityreference.go
View file
Open in desktop
File renamed without changes.
0 ...atchaccount/model_encryptionproperties.go → ...atchaccount/model_encryptionproperties.go
View file
Open in desktop
File renamed without changes.
Loading