Skip to content

Commit ccb3f92

Browse files
committed
provider/google: Added url map resource + tests & documentation
1 parent 232a538 commit ccb3f92

8 files changed

Lines changed: 1116 additions & 12 deletions

File tree

builtin/providers/google/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"google.golang.org/api/compute/v1"
1818
"google.golang.org/api/container/v1"
1919
"google.golang.org/api/dns/v1"
20-
"google.golang.org/api/storage/v1"
2120
"google.golang.org/api/sqladmin/v1beta4"
21+
"google.golang.org/api/storage/v1"
2222
)
2323

2424
// Config is the configuration structure used to instantiate the Google

builtin/providers/google/provider.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,19 @@ func Provider() terraform.ResourceProvider {
4343
"google_compute_global_address": resourceComputeGlobalAddress(),
4444
"google_compute_http_health_check": resourceComputeHttpHealthCheck(),
4545
"google_compute_instance": resourceComputeInstance(),
46+
"google_compute_instance_group_manager": resourceComputeInstanceGroupManager(),
4647
"google_compute_instance_template": resourceComputeInstanceTemplate(),
4748
"google_compute_network": resourceComputeNetwork(),
4849
"google_compute_project_metadata": resourceComputeProjectMetadata(),
4950
"google_compute_route": resourceComputeRoute(),
5051
"google_compute_ssl_certificate": resourceComputeSslCertificate(),
5152
"google_compute_target_pool": resourceComputeTargetPool(),
53+
"google_compute_url_map": resourceComputeUrlMap(),
5254
"google_compute_vpn_gateway": resourceComputeVpnGateway(),
5355
"google_compute_vpn_tunnel": resourceComputeVpnTunnel(),
5456
"google_container_cluster": resourceContainerCluster(),
5557
"google_dns_managed_zone": resourceDnsManagedZone(),
5658
"google_dns_record_set": resourceDnsRecordSet(),
57-
"google_compute_instance_group_manager": resourceComputeInstanceGroupManager(),
5859
"google_sql_database": resourceSqlDatabase(),
5960
"google_sql_database_instance": resourceSqlDatabaseInstance(),
6061
"google_storage_bucket": resourceStorageBucket(),

builtin/providers/google/resource_compute_instance_template.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,17 @@ func resourceComputeInstanceTemplate() *schema.Resource {
159159
},
160160

161161
"automatic_restart": &schema.Schema{
162-
Type: schema.TypeBool,
163-
Optional: true,
164-
Default: true,
165-
ForceNew: true,
162+
Type: schema.TypeBool,
163+
Optional: true,
164+
Default: true,
165+
ForceNew: true,
166166
Deprecated: "Please use `scheduling.automatic_restart` instead",
167167
},
168168

169169
"on_host_maintenance": &schema.Schema{
170-
Type: schema.TypeString,
171-
Optional: true,
172-
ForceNew: true,
170+
Type: schema.TypeString,
171+
Optional: true,
172+
ForceNew: true,
173173
Deprecated: "Please use `scheduling.on_host_maintenance` instead",
174174
},
175175

@@ -413,7 +413,6 @@ func resourceComputeInstanceTemplateCreate(d *schema.ResourceData, meta interfac
413413
}
414414
}
415415

416-
417416
serviceAccountsCount := d.Get("service_account.#").(int)
418417
serviceAccounts := make([]*compute.ServiceAccount, 0, serviceAccountsCount)
419418
for i := 0; i < serviceAccountsCount; i++ {

0 commit comments

Comments
 (0)