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

Adding validation to all resource_group_name attributes #330

Merged
merged 3 commits into from
Sep 13, 2017
Merged

Adding validation to all resource_group_name attributes #330

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a61c47a
Adding validation to all resource_group_name attributes
mbfrahry Sep 12, 2017
cb02a3d
Update resource_arm_dns_zone.go
mbfrahry Sep 13, 2017
442c69c
fix spelling error
mbfrahry Sep 13, 2017
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
5 changes: 1 addition & 4 deletions azurerm/data_source_arm_public_ip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ func dataSourceArmPublicIP() *schema.Resource {
Required: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
},
"resource_group_name": resourceGroupNameForDataSourceSchema(),

"domain_name_label": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/data_source_arm_resource_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ func dataSourceArmResourceGroup() *schema.Resource {
Read: dataSourceArmResourceGroupRead,

Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
},

"name": resourceGroupNameForDataSourceSchema(),
"location": locationForDataSourceSchema(),
"tags": tagsForDataSourceSchema(),
},
Expand Down
5 changes: 1 addition & 4 deletions azurerm/data_source_managed_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ func dataSourceArmManagedDisk() *schema.Resource {
Required: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
},
"resource_group_name": resourceGroupNameForDataSourceSchema(),

"storage_account_type": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_app_service_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func resourceArmAppServicePlan() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"location": locationSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_application_insights.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ func resourceArmApplicationInsights() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"location": locationSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_availability_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ func resourceArmAvailabilitySet() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"location": locationSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_cdn_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ func resourceArmCdnEndpoint() *schema.Resource {

"location": locationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"profile_name": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_cdn_profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ func resourceArmCdnProfile() *schema.Resource {

"location": locationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"sku": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_container_registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ func resourceArmContainerRegistry() *schema.Resource {
ValidateFunc: validateAzureRMContainerRegistryName,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"location": locationSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_container_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ func resourceArmContainerService() *schema.Resource {

"location": locationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"orchestration_platform": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_cosmos_db_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@ func resourceArmCosmosDBAccount() *schema.Resource {
StateFunc: azureRMNormalizeLocation,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"offer_type": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_dns_a_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func resourceArmDnsARecord() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"zone_name": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_dns_aaaa_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func resourceArmDnsAAAARecord() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"zone_name": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_dns_cname_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func resourceArmDnsCNameRecord() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"zone_name": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_dns_mx_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ func resourceArmDnsMxRecord() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"zone_name": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_dns_ns_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func resourceArmDnsNsRecord() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"zone_name": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_dns_ptr_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func resourceArmDnsPtrRecord() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"zone_name": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_dns_srv_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ func resourceArmDnsSrvRecord() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"zone_name": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_dns_txt_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ func resourceArmDnsTxtRecord() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"zone_name": {
Type: schema.TypeString,
Expand Down
7 changes: 1 addition & 6 deletions azurerm/resource_arm_dns_zone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ func resourceArmDnsZone() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
DiffSuppressFunc: resourceAzurermResourceGroupNameDiffSuppress,
},
"resource_group_name": resourceGroupNameSchema(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be resourceGroupNameDiffSupressSchema()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good find! Changing it


"number_of_record_sets": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_eventgrid_topic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ func resourceArmEventGridTopic() *schema.Resource {

"location": locationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"tags": tagsSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_eventhub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ func resourceArmEventHub() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"location": locationSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_eventhub_authorization_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@ func resourceArmEventHubAuthorizationRule() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"location": locationSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_eventhub_consumer_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@ func resourceArmEventHubConsumerGroup() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"location": locationSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_eventhub_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@ func resourceArmEventHubNamespace() *schema.Resource {

"location": locationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"sku": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_express_route_circuit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ func resourceArmExpressRouteCircuit() *schema.Resource {
ForceNew: true,
},

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"location": locationSchema(),

Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ func resourceArmImage() *schema.Resource {

"location": locationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"source_virtual_machine_id": {
Type: schema.TypeString,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_key_vault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ func resourceArmKeyVault() *schema.Resource {

"location": locationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"sku": {
Type: schema.TypeSet,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ func resourceArmLoadBalancer() *schema.Resource {

"location": locationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"frontend_ip_configuration": {
Type: schema.TypeList,
Expand Down
6 changes: 1 addition & 5 deletions azurerm/resource_arm_loadbalancer_backend_address_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ func resourceArmLoadBalancerBackendAddressPool() *schema.Resource {

"location": deprecatedLocationSchema(),

"resource_group_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"resource_group_name": resourceGroupNameSchema(),

"loadbalancer_id": {
Type: schema.TypeString,
Expand Down
Loading