public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Update ssl_policy to use v1 API (#1368)

Browse Source 
* Update compute/v1 to latest

* Update ssl_policy resource and test to v1 API
This commit is contained in:
Nick Jacques 2018-04-24 16:43:00 -05:00 committed by Vincent Roseberry
parent e02587855a
commit 0d309b1e56
5 changed files with 4601 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
google/resource_compute_ssl_policy.go
View File

@ -6,7 +6,7 @@ import (
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
computeBeta "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
)
func resourceComputeSslPolicy() *schema.Resource {
@ -120,7 +120,7 @@ func resourceComputeSslPolicyCreate(d *schema.ResourceData, meta interface{}) er
return err
}
sslPolicy := &computeBeta.SslPolicy{
sslPolicy := &compute.SslPolicy{
Name: d.Get("name").(string),
Description: d.Get("description").(string),
Profile: d.Get("profile").(string),
@ -128,7 +128,7 @@ func resourceComputeSslPolicyCreate(d *schema.ResourceData, meta interface{}) er
CustomFeatures: convertStringSet(d.Get("custom_features").(*schema.Set)),
}
op, err := config.clientComputeBeta.SslPolicies.Insert(project, sslPolicy).Do()
op, err := config.clientCompute.SslPolicies.Insert(project, sslPolicy).Do()
if err != nil {
return fmt.Errorf("Error creating SSL Policy: %s", err)
}
@ -154,7 +154,7 @@ func resourceComputeSslPolicyRead(d *schema.ResourceData, meta interface{}) erro
name := d.Id()
sslPolicy, err := config.clientComputeBeta.SslPolicies.Get(project, name).Do()
sslPolicy, err := config.clientCompute.SslPolicies.Get(project, name).Do()
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("SSL Policy %q", name))
}
@ -185,7 +185,7 @@ func resourceComputeSslPolicyUpdate(d *schema.ResourceData, meta interface{}) er
name := d.Get("name").(string)
sslPolicy := &computeBeta.SslPolicy{
sslPolicy := &compute.SslPolicy{
Fingerprint: d.Get("fingerprint").(string),
Profile: d.Get("profile").(string),
MinTlsVersion: d.Get("min_tls_version").(string),
@ -199,7 +199,7 @@ func resourceComputeSslPolicyUpdate(d *schema.ResourceData, meta interface{}) er
}
}
op, err := config.clientComputeBeta.SslPolicies.Patch(project, name, sslPolicy).Do()
op, err := config.clientCompute.SslPolicies.Patch(project, name, sslPolicy).Do()
if err != nil {
return fmt.Errorf("Error updating SSL Policy: %s", err)
}
@ -223,7 +223,7 @@ func resourceComputeSslPolicyDelete(d *schema.ResourceData, meta interface{}) er
name := d.Get("name").(string)
op, err := config.clientComputeBeta.SslPolicies.Delete(project, name).Do()
op, err := config.clientCompute.SslPolicies.Delete(project, name).Do()
if err != nil {
return fmt.Errorf("Error deleting SSL Policy: %s", err)
}

22
google/resource_compute_ssl_policy_test.go
View File

@ -7,13 +7,13 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
computeBeta "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1"
)
func TestAccComputeSslPolicy_basic(t *testing.T) {
t.Parallel()
var sslPolicy computeBeta.SslPolicy
var sslPolicy compute.SslPolicy
sslPolicyName := fmt.Sprintf("test-ssl-policy-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
@ -45,7 +45,7 @@ func TestAccComputeSslPolicy_basic(t *testing.T) {
func TestAccComputeSslPolicy_profile(t *testing.T) {
t.Parallel()
var sslPolicy computeBeta.SslPolicy
var sslPolicy compute.SslPolicy
sslPolicyName := fmt.Sprintf("test-ssl-policy-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
@ -74,7 +74,7 @@ func TestAccComputeSslPolicy_profile(t *testing.T) {
func TestAccComputeSslPolicy_update(t *testing.T) {
t.Parallel()
var sslPolicy computeBeta.SslPolicy
var sslPolicy compute.SslPolicy
sslPolicyName := fmt.Sprintf("test-ssl-policy-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
@ -121,7 +121,7 @@ func TestAccComputeSslPolicy_update(t *testing.T) {
func TestAccComputeSslPolicy_tls_version(t *testing.T) {
t.Parallel()
var sslPolicy computeBeta.SslPolicy
var sslPolicy compute.SslPolicy
sslPolicyName := fmt.Sprintf("test-ssl-policy-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
@ -150,7 +150,7 @@ func TestAccComputeSslPolicy_tls_version(t *testing.T) {
func TestAccComputeSslPolicy_custom(t *testing.T) {
t.Parallel()
var sslPolicy computeBeta.SslPolicy
var sslPolicy compute.SslPolicy
sslPolicyName := fmt.Sprintf("test-ssl-policy-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
@ -181,7 +181,7 @@ func TestAccComputeSslPolicy_custom(t *testing.T) {
func TestAccComputeSslPolicy_update_to_custom(t *testing.T) {
t.Parallel()
var sslPolicy computeBeta.SslPolicy
var sslPolicy compute.SslPolicy
sslPolicyName := fmt.Sprintf("test-ssl-policy-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
@ -228,7 +228,7 @@ func TestAccComputeSslPolicy_update_to_custom(t *testing.T) {
func TestAccComputeSslPolicy_update_from_custom(t *testing.T) {
t.Parallel()
var sslPolicy computeBeta.SslPolicy
var sslPolicy compute.SslPolicy
sslPolicyName := fmt.Sprintf("test-ssl-policy-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
@ -272,7 +272,7 @@ func TestAccComputeSslPolicy_update_from_custom(t *testing.T) {
})
}
func testAccCheckComputeSslPolicyExists(n string, sslPolicy *computeBeta.SslPolicy) resource.TestCheckFunc {
func testAccCheckComputeSslPolicyExists(n string, sslPolicy *compute.SslPolicy) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
if !ok {
@ -292,7 +292,7 @@ func testAccCheckComputeSslPolicyExists(n string, sslPolicy *computeBeta.SslPoli
name := rs.Primary.Attributes["name"]
found, err := config.clientComputeBeta.SslPolicies.Get(
found, err := config.clientCompute.SslPolicies.Get(
project, name).Do()
if err != nil {
return fmt.Errorf("Error Reading SSL Policy %s: %s", name, err)
@ -316,7 +316,7 @@ func testAccCheckComputeSslPolicyDestroy(s *terraform.State) error {
continue
}
_, err := config.clientComputeBeta.SslPolicies.Get(
_, err := config.clientCompute.SslPolicies.Get(
config.Project, rs.Primary.ID).Do()
if err == nil {
return fmt.Errorf("SSL Policy still exists")

1225
vendor/google.golang.org/api/compute/v1/compute-api.json generated vendored
View File

File diff suppressed because it is too large Load Diff

3440
vendor/google.golang.org/api/compute/v1/compute-gen.go generated vendored
View File

File diff suppressed because it is too large Load Diff

6
vendor/vendor.json vendored
View File

@ -1280,10 +1280,10 @@
"revisionTime": "2018-03-26T00:03:39Z"
},
{
"checksumSHA1": "aAUKwislYt7nWiu0O9UTKZz9Xnc=",
"checksumSHA1": "5ZmxWSE3+bfzxX6IJDmTtmjurJU=",
"path": "google.golang.org/api/compute/v1",
"revision": "e4126357c891acdef6dcd7805daa4c6533be6544",
"revisionTime": "2018-03-26T00:03:39Z"
"revision": "8b8c1d4168b3aa7d5fbdb9eb159a1a7ac0cc146d",
"revisionTime": "2018-04-24T00:04:29Z"
},
{
"checksumSHA1": "acuDPZa9rxUvFhdijdVfG4jy+rw=",