mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-06-29 06:42:36 +00:00
94a405d179
* Move AliasIpRange helpers into utils
To reflect the fact they'll be used by multiple resources.
* Pass Config to build helpers, not meta
It's the only thing meta is used for.
* Refactor getNetwork util methods to return early for the happy path.
* Update compute APIs
compute.Instance.MinCpuPlatform is now GA.
* Fix panic in TestComputeInstanceMigrateState
This seemed to be a pre-existing issue, i.e. I could repro it in master.
--- FAIL: TestComputeInstanceMigrateState (0.00s)
panic: interface conversion: interface {} is nil, not *google.Config [recovered]
panic: interface conversion: interface {} is nil, not *google.Config
goroutine 85 [running]:
testing.tRunner.func1(0xc4205d60f0)
/usr/local/Cellar/go/1.9.1/libexec/src/testing/testing.go:711 +0x2d2
panic(0x203acc0, 0xc4205d2080)
/usr/local/Cellar/go/1.9.1/libexec/src/runtime/panic.go:491 +0x283
github.com/terraform-providers/terraform-provider-google/google.migrateStateV3toV4(0xc4205f2000, 0x0, 0x0, 0x0, 0x48, 0xc4205f2000)
/Users/negz/control/go/src/github.com/terraform-providers/terraform-provider-google/google/resource_compute_instance_migrate.go:182 +0x2405
github.com/terraform-providers/terraform-provider-google/google.resourceComputeInstanceMigrateState(0x2, 0xc4205f2000, 0x0, 0x0, 0x0, 0x0, 0xe0000000000)
/Users/negz/control/go/src/github.com/terraform-providers/terraform-provider-google/google/resource_compute_instance_migrate.go:48 +0x21a
github.com/terraform-providers/terraform-provider-google/google.runInstanceMigrateTest(0xc4205d60f0, 0x2260816, 0x8, 0x227d23a, 0x20, 0x2, 0xc4205ec0f0, 0xc4205ec120, 0x0,
0x0)
/Users/negz/control/go/src/github.com/terraform-providers/terraform-provider-google/google/resource_compute_instance_migrate_test.go:803 +0xc1
github.com/terraform-providers/terraform-provider-google/google.TestComputeInstanceMigrateState(0xc4205d60f0)
/Users/negz/control/go/src/github.com/terraform-providers/terraform-provider-google/google/resource_compute_instance_migrate_test.go:71 +0xc84
testing.tRunner(0xc4205d60f0, 0x22d81c0)
/usr/local/Cellar/go/1.9.1/libexec/src/testing/testing.go:746 +0xd0
created by testing.(*T).Run
/usr/local/Cellar/go/1.9.1/libexec/src/testing/testing.go:789 +0x2de
FAIL github.com/terraform-providers/terraform-provider-google/google 0.035s
* Use only the v1 API for resource_compute_instance
Alias IP ranges, Accelerators, and min CPU platform are now GA.
* Move common instance code into utils.go
Methods used by both resource_compute_instance and
resource_compute_instance_template are currently spread between their respective
files, and utils.go.
This commit moves them all into utils.go for the sake of consistency. It may be
worth considering an instance_common.go file or similar.
* Unify compute_instance and compute_instance_template network_interface and service_account code
This has the side effect of enabling Alias IP range support for
compute_instance_templates.
* Add tests for compute instance template Alias IP ranges
* Mark instance template region as computed
We compute it from the subnet its network interfaces are in. Note this
is not new behaviour - I believe it was erroneously missing the computed
flag.
* Support guest accelerators for instance templates
Since most of the code is already there.
* Add a test for using 'address' rather than 'network_ip' for instance templates
* Don't mark assigned_nat_ip as deprecated
* Remove network_interface schema fields that don't make sense for a compute instance template
* Add newline after count in instance template docs
* Don't try to dedupe guest accelerator expansion code
The API calls to Google to create guest accelerators take different values
for instances and instance templates. Instance templates don't have a zone
and can thus *only* be passed a guest accelerator name.
* Use ParseNetworkFieldValue instead of getNetworkLink
* Add support for parsing regional fields, and subnetworks specifically
Currently unused because subnetworks may have a separate project from that
of the instance using them, which complicates looking up the project field.
* Fall back to provider region when parsing regional field values
Also slightly refactors getXFromSchema field helper functions for readability.
* Revert to assigned_nat_ip in compute instance docs
* Add beta scaffolding to compute instance and compute instance template
Note these resources don't currently use beta features - this is futureproofing.
* Fix indentation in comment about instance template alias IP ranges
* Consolidate metadata helper functions in metadata.go
* Move compute instance (and template) related helpers into their own file
54 lines
2.5 KiB
Go
54 lines
2.5 KiB
Go
package google
|
|
|
|
import "github.com/hashicorp/terraform/helper/schema"
|
|
|
|
func canonicalizeServiceScope(scope string) string {
|
|
// This is a convenience map of short names used by the gcloud tool
|
|
// to the GCE auth endpoints they alias to.
|
|
scopeMap := map[string]string{
|
|
"bigquery": "https://www.googleapis.com/auth/bigquery",
|
|
"cloud-platform": "https://www.googleapis.com/auth/cloud-platform",
|
|
"cloud-source-repos": "https://www.googleapis.com/auth/source.full_control",
|
|
"cloud-source-repos-ro": "https://www.googleapis.com/auth/source.read_only",
|
|
"compute-ro": "https://www.googleapis.com/auth/compute.readonly",
|
|
"compute-rw": "https://www.googleapis.com/auth/compute",
|
|
"datastore": "https://www.googleapis.com/auth/datastore",
|
|
"logging-write": "https://www.googleapis.com/auth/logging.write",
|
|
"monitoring": "https://www.googleapis.com/auth/monitoring",
|
|
"monitoring-write": "https://www.googleapis.com/auth/monitoring.write",
|
|
"pubsub": "https://www.googleapis.com/auth/pubsub",
|
|
"service-control": "https://www.googleapis.com/auth/servicecontrol",
|
|
"service-management": "https://www.googleapis.com/auth/service.management.readonly",
|
|
"sql": "https://www.googleapis.com/auth/sqlservice",
|
|
"sql-admin": "https://www.googleapis.com/auth/sqlservice.admin",
|
|
"storage-full": "https://www.googleapis.com/auth/devstorage.full_control",
|
|
"storage-ro": "https://www.googleapis.com/auth/devstorage.read_only",
|
|
"storage-rw": "https://www.googleapis.com/auth/devstorage.read_write",
|
|
"taskqueue": "https://www.googleapis.com/auth/taskqueue",
|
|
"trace-append": "https://www.googleapis.com/auth/trace.append",
|
|
"trace-ro": "https://www.googleapis.com/auth/trace.readonly",
|
|
"useraccounts-ro": "https://www.googleapis.com/auth/cloud.useraccounts.readonly",
|
|
"useraccounts-rw": "https://www.googleapis.com/auth/cloud.useraccounts",
|
|
"userinfo-email": "https://www.googleapis.com/auth/userinfo.email",
|
|
}
|
|
|
|
if matchedURL, ok := scopeMap[scope]; ok {
|
|
return matchedURL
|
|
}
|
|
|
|
return scope
|
|
}
|
|
|
|
func canonicalizeServiceScopes(scopes []string) []string {
|
|
cs := make([]string, len(scopes))
|
|
for i, scope := range scopes {
|
|
cs[i] = canonicalizeServiceScope(scope)
|
|
}
|
|
return cs
|
|
}
|
|
|
|
func stringScopeHashcode(v interface{}) int {
|
|
v = canonicalizeServiceScope(v.(string))
|
|
return schema.HashString(v)
|
|
}
|