Skip to content

Commit

Permalink
spelling (hashicorp#9250)
Browse files Browse the repository at this point in the history
  • Loading branch information
katbyte authored Nov 10, 2020
1 parent c3c2822 commit 18407e0
Show file tree
Hide file tree
Showing 20 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/Bug_Report.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ To obtain the debug output, see the [Terraform documentation on debugging](https

<!--- If Terraform produced a panic, please provide a link to a GitHub Gist containing the output of the `crash.log`. --->

### Expected Behavior
### Expected Behaviour

<!--- What should have happened? --->

### Actual Behavior
### Actual Behaviour

<!--- What actually happened? --->

Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG-v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@ IMPROVEMENTS:
* `azurerm_policy_assignment` - support exclusions with the `not_scopes` property ([#2620](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2620))
* `azurerm_policy_definition` - polices can now be assigned to a management group ([#2490](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2490))
* `azurerm_policy_set_definition` - policy sets can now be assigned to a management group ([#2618](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2618))
* `azurerm_public_ip` - deprecated `public_ip_address_allocation` in favor of `allocation_method` to better match the SDK ([#2576](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2576))
* `azurerm_public_ip` - deprecated `public_ip_address_allocation` in favour of `allocation_method` to better match the SDK ([#2576](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2576))
* `azurerm_redis_cache` - add availability zone support ([#2580](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2580))
* `azurerm_service_fabric_cluster` - support for `azure_active_directory` ([#2553](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2553))
* `azurerm_service_fabric_cluster` - support for `reverse_proxy_certificate` ([#2544](https://github.com/terraform-providers/terraform-provider-azurerm/issues/2544))
Expand Down Expand Up @@ -1757,7 +1757,7 @@ BUG FIXES:
IMPROVEMENTS:

* `azurerm_automation_schedule` - adding the `interval` property and supporting recurring schedules ([#1384](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1384))
* `azurerm_dns_ns_record` - deprecated `record` properties in favor of a `records` list ([#991](https://github.com/terraform-providers/terraform-provider-azurerm/issues/991))
* `azurerm_dns_ns_record` - deprecated `record` properties in favour of a `records` list ([#991](https://github.com/terraform-providers/terraform-provider-azurerm/issues/991))
* `azurerm_function_app` - adding the `identity` property ([#1369](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1369))
* `azurerm_role_definition` - the `role_definition_id` property is now optional. The resource will now generate a random UUID if it is ommited ([#1378](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1378))
* `azurerm_storage_account` - adding the `network_rules` property ([#1334](https://github.com/terraform-providers/terraform-provider-azurerm/issues/1334))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ func expandArmAutomationScheduleAdvanced(d *schema.ResourceData, isUpdate bool)
expandedAdvancedSchedule := automation.AdvancedSchedule{}

// If frequency is set to `Month` the `week_days` array cannot be set (even empty), otherwise the API returns an error.
// During update it can be set and it will not return an error. Workaround for the APIs behavior
// During update it can be set and it will not return an error. Workaround for the APIs behaviour
if v, ok := d.GetOk("week_days"); ok {
weekDays := v.(*schema.Set).List()
expandedWeekDays := make([]string, len(weekDays))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

// Scenario: Basic BP, no artifacts etc. Stored and applied at Subscription.
// Scenario: Basic BP, no artefacts etc. Stored and applied at Subscription.
func TestAccBlueprintAssignment_basic(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_blueprint_assignment", "test")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func ExpandArmCdnEndpointActionCacheKeyQueryString(input []interface{}) (*[]cdn.

if parameters := item["parameters"].(string); parameters == "" {
if behavior := cacheKeyQueryStringAction.Parameters.QueryStringBehavior; behavior == cdn.Include || behavior == cdn.Exclude {
return nil, fmt.Errorf("Parameters can not be empty if the behavior is either Include or Exclude.")
return nil, fmt.Errorf("Parameters can not be empty if the behaviour is either Include or Exclude.")
}
} else {
cacheKeyQueryStringAction.Parameters.QueryParameters = utils.String(parameters)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ func resourceArmKubernetesCluster() *schema.Resource {
ForceNew: true,
Computed: true,
ConflictsWith: []string{"private_cluster_enabled"},
Deprecated: "Deprecated in favor of `private_cluster_enabled`", // TODO -- remove this in next major version
Deprecated: "Deprecated in favour of `private_cluster_enabled`", // TODO -- remove this in next major version
},

"private_cluster_enabled": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func ExpandDefaultNodePool(d *schema.ResourceData) (*[]containerservice.ManagedC
maxCount := raw["max_count"].(int)
minCount := raw["min_count"].(int)

// Count must always be set (see #6094), RP behavior has changed
// Count must always be set (see #6094), RP behaviour has changed
// since the API version upgrade in v2.1.0 making Count required
// for all create/update requests
profile.Count = utils.Int32(int32(count))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func ValidateDatabricksWorkspaceName(i interface{}, k string) (warnings []string
// 1) Cannot be empty
if len(v) == 0 {
errors = append(errors, fmt.Errorf("%q cannot be an empty string: %q", k, v))
// Treating this as a special case and returning early to match Azure Portal behavior.
// Treating this as a special case and returning early to match Azure Portal behaviour.
return warnings, errors
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func resourceArmIntegrationServiceEnvironmentDelete(d *schema.ResourceData, meta
// Get subnet IDs before delete
subnetIDs := getSubnetIDs(&resp)

// Not optimal behavior for now
// Not optimal behaviour for now
// It deletes synchronously and resource is not available anymore after return from delete operation
// Next, after return - delete operation is still in progress in the background and is still occupying subnets.
// As workaround we are checking on all involved subnets presence of serviceAssociationLink and resourceNavigationLink
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,39 +60,39 @@ func resourceArmNetworkConnectionMonitor() *schema.Resource {
Type: schema.TypeBool,
Optional: true,
Computed: true,
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
},

"interval_in_seconds": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ValidateFunc: validation.IntAtLeast(30),
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
},

"source": {
Type: schema.TypeList,
Optional: true,
Computed: true,
MaxItems: 1,
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"virtual_machine_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: azure.ValidateResourceID,
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
},

"port": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ValidateFunc: validate.PortNumberOrZero,
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
},
},
},
Expand All @@ -103,7 +103,7 @@ func resourceArmNetworkConnectionMonitor() *schema.Resource {
Optional: true,
Computed: true,
MaxItems: 1,
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"virtual_machine_id": {
Expand All @@ -112,23 +112,23 @@ func resourceArmNetworkConnectionMonitor() *schema.Resource {
Computed: true,
ValidateFunc: azure.ValidateResourceID,
ConflictsWith: []string{"destination.0.address"},
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
},

"address": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ConflictsWith: []string{"destination.0.virtual_machine_id"},
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
},

"port": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
ValidateFunc: validate.PortNumber,
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favor of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
Deprecated: "The field belongs to the v1 network connection monitor, which is now deprecated in favour of v2 by Azure. Please check the document (https://www.terraform.io/docs/providers/azurerm/r/network_connection_monitor.html) for the v2 properties.",
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func resourceArmPolicySetDefinition() *schema.Resource {
ValidateFunc: validation.StringIsJSON,
DiffSuppressFunc: policyDefinitionsDiffSuppressFunc,
ExactlyOneOf: []string{"policy_definitions", "policy_definition_reference"},
Deprecated: "Deprecated in favor of `policy_definition_reference`",
Deprecated: "Deprecated in favour of `policy_definition_reference`",
},

"policy_definition_reference": { // TODO -- rename this back to `policy_definition` after the deprecation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ func getArmTrafficManagerEndpointProperties(d *schema.ResourceData) *trafficmana

if resourceId := d.Get("target_resource_id").(string); resourceId != "" {
endpointProps.TargetResourceID = utils.String(resourceId)
// NOTE: Workaround for upstream behavior: if the target is blank instead of nil, the REST API will throw a 500 error
// NOTE: Workaround for upstream behaviour: if the target is blank instead of nil, the REST API will throw a 500 error
if target == "" {
endpointProps.Target = nil
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func resourceArmAppServiceEnvironmentCreate(d *schema.ResourceData, meta interfa
return err
}

// TODO: Remove the implicit behavior in new major version.
// TODO: Remove the implicit behaviour in new major version.
// Discrepancy of resource group between ASE and Subnet is allowed. While for the sake of
// compatibility, we still allow user to use the resource group of Subnet to be the one for
// ASE implicitly. While allow user to explicitly specify the resource group, which takes higher
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/web/resource_arm_function_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func resourceArmFunctionApp() *schema.Resource {
Computed: true,
ForceNew: true,
Sensitive: true,
Deprecated: "Deprecated in favor of `storage_account_name` and `storage_account_access_key`",
Deprecated: "Deprecated in favour of `storage_account_name` and `storage_account_access_key`",
ConflictsWith: []string{"storage_account_name", "storage_account_access_key"},
},

Expand Down
2 changes: 1 addition & 1 deletion website/docs/d/nat_gateway.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The following attributes are exported:

* `zones` - A list of Availability Zones which the NAT Gateway exists in.

~> **NOTE:** The field `public_ip_address_ids` has been deprecated in favor of `azurerm_nat_gateway_public_ip_association`.
~> **NOTE:** The field `public_ip_address_ids` has been deprecated in favour of `azurerm_nat_gateway_public_ip_association`.

## Timeouts

Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/cosmosdb_sql_container.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ An `indexing_policy` block supports the following:

An `included_path` block supports the following:

* `path` - Path for which the indexing behavior applies to.
* `path` - Path for which the indexing behaviour applies to.

An `excluded_path` block supports the following:

Expand All @@ -104,7 +104,7 @@ A `composite_index` block supports the following:

An `index` block supports the following:

* `path` - Path for which the indexing behavior applies to.
* `path` - Path for which the indexing behaviour applies to.

* `order` - Order of the index. Possible values are `Ascending` or `Descending`.

Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/frontdoor.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ The `forwarding_configuration` block supports the following:

* `cache_use_dynamic_compression` - (Optional) Whether to use dynamic compression when caching. Valid options are `true` or `false`. Defaults to `false`.

* `cache_query_parameter_strip_directive` - (Optional) Defines cache behavior in releation to query string parameters. Valid options are `StripAll` or `StripNone`. Defaults to `StripAll`.
* `cache_query_parameter_strip_directive` - (Optional) Defines cache behaviour in releation to query string parameters. Valid options are `StripAll` or `StripNone`. Defaults to `StripAll`.

* `custom_forwarding_path` - (Optional) Path to use when constructing the request to forward to the backend. This functions as a URL Rewrite. Default behavior preserves the URL path.
* `custom_forwarding_path` - (Optional) Path to use when constructing the request to forward to the backend. This functions as a URL Rewrite. Default behaviour preserves the URL path.

* `forwarding_protocol` - (Optional) Protocol to use when redirecting. Valid options are `HttpOnly`, `HttpsOnly`, or `MatchRequest`. Defaults to `HttpsOnly`.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The following arguments are supported:

* `data_retention_time` - (Required) Specifies the ISO8601 timespan specifying the minimum number of days the environment's events will be available for query. Changing this forces a new resource to be created.

* `storage_limit_exceeded_behavior` - (Optional) Specifies the behavior the IoT Time Series Insights service should take when the environment's capacity has been exceeded. Valid values include `PauseIngress` and `PurgeOldData`. Defaults to `PurgeOldData`.
* `storage_limit_exceeded_behavior` - (Optional) Specifies the behaviour the IoT Time Series Insights service should take when the environment's capacity has been exceeded. Valid values include `PauseIngress` and `PurgeOldData`. Defaults to `PurgeOldData`.

* `partition_key` - (Optional) The name of the event property which will be used to partition data. Changing this forces a new resource to be created.

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/network_connection_monitor.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ A `endpoint` block supports the following:

A `filter` block supports the following:

* `type` - (Optional) The behavior type of this endpoint filter. Currently the only allowed value is `Include`. Defaults to `Include`.
* `type` - (Optional) The behaviour type of this endpoint filter. Currently the only allowed value is `Include`. Defaults to `Include`.

* `item` - (Optional) A `item` block as defined below.

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/policy_set_definition.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ The following arguments are supported:

* `display_name` - (Required) The display name of the policy set definition.

* `policy_definitions` - (Optional / **Deprecated in favor of `policy_definition_reference`**) The policy definitions for the policy set definition. This is a json object representing the bundled policy definitions.
* `policy_definitions` - (Optional / **Deprecated in favour of `policy_definition_reference`**) The policy definitions for the policy set definition. This is a json object representing the bundled policy definitions.

* `policy_definition_reference` - (Optional) One or more `policy_definition_reference` blocks as defined below.

Expand Down

0 comments on commit 18407e0

Please sign in to comment.