Commit Graph

525 Commits

Author SHA1 Message Date
Thomas Poindessous
0a9dddb6e1 Review by @paddyforan: corrected documentation. Replaced disk by source_disk. Deleted sourcedisk_id 2017-03-27 10:36:39 +02:00
Thomas Poindessous
64e400154c Review by @paddyforan: better test possible network error 2017-03-23 12:05:14 +01:00
Thomas Poindessous
7b8db44198 Review by @paddyforan: Set attributes returned by API 2017-03-23 10:38:57 +01:00
Dana Hoffman
69c62b59a5 provider/google: turn compute_instance_group.instances into a set (#12790) 2017-03-22 17:47:41 -07:00
Dana Hoffman
65ab2a6c3a provider/google: replace instance group manager urls with instance group urls in container cluster tests 2017-03-22 16:33:11 -07:00
Thomas Poindessous
8b3a27eb41 Merge remote-tracking branch 'upstream/master' into gcp_compute_disk_snapshot 2017-03-22 16:38:40 +01:00
Thomas Poindessous
300d0b7432 Review by @paddyforan: Add a resourceComputeSnapshotExists function 2017-03-22 15:01:45 +01:00
Thomas Poindessous
af5c00a612 Review by @paddyforan: Rename sourcedisk to source_disk 2017-03-22 12:09:25 +01:00
Marc Rooding
5e260751ec Support the container cluster local ssd count property 2017-03-22 09:39:36 +01:00
Dana Hoffman
01a62e71cd Merge pull request #12743 from danawillow/gke-nodeconfig
provider/google: add support for a few more fields in NodeConfig
2017-03-21 15:24:14 -07:00
Dana Hoffman
834ecc4934 provider/google: add support for a few more fields in NodeConfig 2017-03-15 15:11:09 -07:00
Paddy
d3f1edd9f0 provider/google: drop the account file.
This was already marked as removed, but the way the provider handled it,
people were still being prompted for input anyways. This removes it from
the provider entirely, so people won't be prompted for input.
2017-03-15 11:00:54 -07:00
Dana Hoffman
c551e4e51d provider/google: Check all fields in GKE tests instead of just that the resource exists (#12147) 2017-03-14 17:50:58 -07:00
Paddy
fa821f4cd9 Merge pull request #12659 from hashicorp/paddy_remove_deprecated_gcp_project_fields
provider/google: Remove deprecated project fields.
2017-03-14 16:52:40 -07:00
Paddy
4c64b14024 Prune dead function.
This function isn't called anymore, so let's get rid of it.
2017-03-14 16:38:40 -07:00
Paddy
0c2ea60b02 Merge pull request #12668 from hashicorp/paddy_deprecate_google_credentials_file
provider/google: remove deprecated account_file field.
2017-03-14 13:23:59 -07:00
Paddy
36f420c98f Merge pull request #12663 from hashicorp/paddy_deprecate_backend_region
provider/google: remove the backend region field
2017-03-14 13:00:07 -07:00
Paddy
6c3261d149 Remove validateAccountFile function.
As @danawillow noticed, if the field is removed, we don't need to
validate it. Which means more deleting code!
2017-03-14 12:56:02 -07:00
Paddy
479e027d4c Merge pull request #12662 from hashicorp/paddy_9051_forwarding_rule_cycle
provider/google: fix single port diff cycle
2017-03-14 12:49:47 -07:00
Paddy
59b6e2682a Merge pull request #12387 from hashicorp/paddy_11763_gcp_iam_diff
provider/google: ignore expanded v collapsed policies in diff
2017-03-14 12:48:05 -07:00
Paddy
f95b8ccbe1 Merge pull request #12223 from hashicorp/paddy_10984_better_image_resolution
provider/google: upgrade our image resolution logic
2017-03-13 23:45:12 -07:00
Paddy
0af6cb1aa3 Fix variable indents.
Tabs vs spaces is the worst. I really need a way to run terraform fmt on
these inline configs.
2017-03-13 23:23:32 -07:00
Paddy
8799079e90 Refactored into helpers.
Refactored some helpers out that help with retrieving the policies from
state and comparing them, hopefully leading to less code duplication.
2017-03-13 23:20:27 -07:00
Paddy
354d919d75 Update typo.
We never updated the error to use the expectation, not hardcode it to 2.
2017-03-13 22:04:08 -07:00
Paddy
b908568d40 provider/google: remove deprecated account_file field.
Remove the shims for the long-deprecated account_file field in the
Google provider.
2017-03-13 21:58:39 -07:00
Paddy
fe39bfc8b4 provider/google: remove the backend region field
Remove the field region on compute_backend_service as it has been
deprecated a while now and was never used to begin with.
2017-03-13 17:25:32 -07:00
Paddy
b73462aad4 provider/google: fix single port diff cycle
When specifying a single port in port_range, the API would accept it as
input, but would return it as {PORT}-{PORT}. Terraform would then see
this as different, even though (semantically) it's the same.

This commit adds a test that exposes the diff cycle created by this, and
an inline DiffSuppressFunc to resolve it.

Fixes #9051.
2017-03-13 17:03:20 -07:00
Paddy
a633853770 Update with @danawillow's feedback.
* Make our regexes more permissive (though still separated out for
  readability, despite being identical)
* Add a helper that will improve readability while sanity testing our
  regex results.
2017-03-13 16:39:42 -07:00
Paddy
71d0b45d09 provider/google: Remove deprecated project fields.
Remove the deprecated fields from google_project, and drop all the logic
that went into supporting them. Tests still pass after one minor change.
2017-03-13 16:19:53 -07:00
Paddy
d5d0f4f0a8 Merge pull request #12486 from hashicorp/paddy_4336_instance_manager_api_bug
provider/google: fix container instance group URLs
2017-03-13 11:15:17 -07:00
Thomas Poindessous
5d8ce1376c Test encrypted snapshot of a encrypted disk 2017-03-13 12:27:39 +01:00
Thomas Poindessous
441d41d3ef Use a new image type 2017-03-13 12:27:22 +01:00
Thomas Poindessous
322c64a21a Use a new image type 2017-03-13 12:26:46 +01:00
Thomas Poindessous
81d8269aee Snapshot operations are global by project 2017-03-13 12:26:12 +01:00
Thomas Poindessous
e14e4c7b9c Provided sourcedisk_encryption_key_raw when creating a snapshot of a customer's self encrypted disk 2017-03-13 12:25:11 +01:00
tpoindessous
d625406706 providers/google : google_compute_disk.go : Minor correction : "Deleting disk" message in Delete method (#12521)
* WIP: added a new resource type : google_compute_snapshot

* [WIP]: added a test acceptance for google_compute_snapshot

* Cleanup

* Minor correction : "Deleting disk" message in Delete method

* Error in merge action

* Error in merge action
2017-03-08 17:34:49 +02:00
Thomas Poindessous
446a2cd6e9 Cleanup 2017-03-08 12:21:30 +01:00
Thomas Poindessous
11857816d1 [WIP]: added a test acceptance for google_compute_snapshot 2017-03-07 10:49:02 +01:00
Paddy
6ea1b17f8f provider/google: fix container instance group URLs
Google Container Engine's cluster API returned instance group manager
URLs when it meant to return instance group URLs. See #4336 for details
about the bug.

While this is undeniably an upstream problem, this PR:

* detects the error, meaning it will work as expected when the API is
  fixed.
* corrects the error by requesting the instance group manager, then
  retrieving its instance group URL, and using that instead.
* adds a test that exercises the error and the solution, to ensure it is
  functioning properly.
2017-03-06 21:14:32 -08:00
Thomas Poindessous
32f5c0d421 WIP: added a new resource type : google_compute_snapshot 2017-03-07 00:26:38 +01:00
Dana Hoffman
2486f618d8 provider/google: initial commit for node pool resource (#11802)
provider/google: initial commit for node pool resource
2017-03-06 14:59:24 -08:00
Paddy
bbad8be2f3 Merge pull request #12434 from hashicorp/paddy_fix_gcp_storage_region_test
provider/google: add location to storage tests.
2017-03-03 16:58:18 -08:00
Paddy
8d223b5af7 provider/google: log the op name in sql op errors.
To aid in tracking down the error that's causing
TestAccGoogleSqlDatabaseInstance_basic to fail (it's claiming an op
can't be found?) I've added the op name (which is unique) to the error
output for op errors.
2017-03-03 16:45:25 -08:00
Paddy
629dfe7ad7 provider/google: add location to storage tests.
Add location to storage tests that need it, which fixes the failing
TestAccStorageStorageClass test.
2017-03-03 15:51:36 -08:00
Paddy
7238458619 provider/google: retry storage creation/deletion on rate limiting
Our GCP storage tests are really flaky right now due to rate limiting.
In theory, this could also impact Terraform users that are
deleting/creating large numbers of Google Cloud Storage buckets at once.

To fix, I'm detecting the specific error code that GCP returns when it's
a rate limit error, and using that with resource.Retry to try the
request again.
2017-03-02 16:42:28 -08:00
Paddy
ce3c599f6f provider/google: ignore expanded v collapsed policies in diff
When comparing the config and state for google_project_iam_policy,
always merge the bindings down to a common representation, to avoid a
perpetual diff.

Fixes #11763.
2017-03-02 14:00:45 -08:00
Dana Hoffman
0bf54f4fe4 provider/google: fix url map test and update logic (#12317) 2017-03-01 09:47:12 +00:00
Paddy
869c7a6103 Update the docs for resolveImage.
Update the explanation of the logic being followed in resolveImage.
2017-02-23 22:09:07 -08:00
Paddy
e55e5e9119 provider/google: update image resolution code.
Add tests that ensure that image syntax resolves to API input the way we
want it to.

Add a lot of different input forms for images, to more closely map to
what the API accepts, so anything that's valid input to the API should
also be valid input in a config.

Stop resolving image families to specific image URLs, allowing things
like instance templates to evolve over time as new images are pushed.
2017-02-23 21:55:30 -08:00
Paddy
a720f10b27 Merge branch 'master' into paddy_10984_better_image_resolution 2017-02-23 15:12:47 -08:00