Skip to content

Commit

Permalink
Promote region health check to GA (#1507)
Browse files Browse the repository at this point in the history 
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
@modular-magician
modular-magician authored and Ty Larrabee committed Dec 11, 2019
1 parent de9cb0f commit f75b584
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 36 deletions.
80 changes: 60 additions & 20 deletions google-beta/resource_compute_region_health_check_generated_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckTcpExample(t *testing.T) {

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckTcpExample(context),
},
{
ResourceName: "google_compute_region_health_check.tcp-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckTcpExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "tcp-region-health-check" {
provider = google-beta
name = "tcp-region-health-check%{random_suffix}"
timeout_sec = 1
Expand All @@ -68,20 +72,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckTcpFullExample(t *testing.

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckTcpFullExample(context),
},
{
ResourceName: "google_compute_region_health_check.tcp-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckTcpFullExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "tcp-region-health-check" {
provider = google-beta
name = "tcp-region-health-check%{random_suffix}"
description = "Health check via tcp"
Expand Down Expand Up @@ -110,20 +118,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckSslExample(t *testing.T) {

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckSslExample(context),
},
{
ResourceName: "google_compute_region_health_check.ssl-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckSslExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "ssl-region-health-check" {
provider = google-beta
name = "ssl-region-health-check%{random_suffix}"
timeout_sec = 1
Expand All @@ -145,20 +157,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckSslFullExample(t *testing.

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckSslFullExample(context),
},
{
ResourceName: "google_compute_region_health_check.ssl-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckSslFullExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "ssl-region-health-check" {
provider = google-beta
name = "ssl-region-health-check%{random_suffix}"
description = "Health check via ssl"
Expand Down Expand Up @@ -187,20 +203,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckHttpExample(t *testing.T)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckHttpExample(context),
},
{
ResourceName: "google_compute_region_health_check.http-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckHttpExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "http-region-health-check" {
provider = google-beta
name = "http-region-health-check%{random_suffix}"
timeout_sec = 1
Expand All @@ -222,20 +242,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckHttpFullExample(t *testing

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckHttpFullExample(context),
},
{
ResourceName: "google_compute_region_health_check.http-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckHttpFullExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "http-region-health-check" {
provider = google-beta
name = "http-region-health-check%{random_suffix}"
description = "Health check via http"
Expand Down Expand Up @@ -265,20 +289,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckHttpsExample(t *testing.T)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckHttpsExample(context),
},
{
ResourceName: "google_compute_region_health_check.https-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckHttpsExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "https-region-health-check" {
provider = google-beta
name = "https-region-health-check%{random_suffix}"
timeout_sec = 1
Expand All @@ -300,20 +328,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckHttpsFullExample(t *testin

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckHttpsFullExample(context),
},
{
ResourceName: "google_compute_region_health_check.https-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckHttpsFullExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "https-region-health-check" {
provider = google-beta
name = "https-region-health-check%{random_suffix}"
description = "Health check via https"
Expand Down Expand Up @@ -343,20 +375,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckHttp2Example(t *testing.T)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckHttp2Example(context),
},
{
ResourceName: "google_compute_region_health_check.http2-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckHttp2Example(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "http2-region-health-check" {
provider = google-beta
name = "http2-region-health-check%{random_suffix}"
timeout_sec = 1
Expand All @@ -378,20 +414,24 @@ func TestAccComputeRegionHealthCheck_regionHealthCheckHttp2FullExample(t *testin

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProvidersOiCS,
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeRegionHealthCheckDestroy,
Steps: []resource.TestStep{
{
Config: testAccComputeRegionHealthCheck_regionHealthCheckHttp2FullExample(context),
},
{
ResourceName: "google_compute_region_health_check.http2-region-health-check",
ImportState: true,
ImportStateVerify: true,
},
},
})
}

func testAccComputeRegionHealthCheck_regionHealthCheckHttp2FullExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_compute_region_health_check" "http2-region-health-check" {
provider = google-beta
name = "http2-region-health-check%{random_suffix}"
description = "Health check via http2"
Expand Down
20 changes: 4 additions & 16 deletions website/docs/r/compute_region_health_check.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ continue to poll unhealthy instances. If an instance later responds
successfully to some number of consecutive probes, it is marked
healthy again and can receive new connections.

~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.

To get more information about RegionHealthCheck, see:

Expand All @@ -53,7 +51,6 @@ To get more information about RegionHealthCheck, see:

```hcl
resource "google_compute_region_health_check" "tcp-region-health-check" {
provider = google-beta
name = "tcp-region-health-check"
timeout_sec = 1
Expand All @@ -74,7 +71,6 @@ resource "google_compute_region_health_check" "tcp-region-health-check" {

```hcl
resource "google_compute_region_health_check" "tcp-region-health-check" {
provider = google-beta
name = "tcp-region-health-check"
description = "Health check via tcp"
Expand Down Expand Up @@ -102,7 +98,6 @@ resource "google_compute_region_health_check" "tcp-region-health-check" {

```hcl
resource "google_compute_region_health_check" "ssl-region-health-check" {
provider = google-beta
name = "ssl-region-health-check"
timeout_sec = 1
Expand All @@ -123,7 +118,6 @@ resource "google_compute_region_health_check" "ssl-region-health-check" {

```hcl
resource "google_compute_region_health_check" "ssl-region-health-check" {
provider = google-beta
name = "ssl-region-health-check"
description = "Health check via ssl"
Expand Down Expand Up @@ -151,7 +145,6 @@ resource "google_compute_region_health_check" "ssl-region-health-check" {

```hcl
resource "google_compute_region_health_check" "http-region-health-check" {
provider = google-beta
name = "http-region-health-check"
timeout_sec = 1
Expand All @@ -172,7 +165,6 @@ resource "google_compute_region_health_check" "http-region-health-check" {

```hcl
resource "google_compute_region_health_check" "http-region-health-check" {
provider = google-beta
name = "http-region-health-check"
description = "Health check via http"
Expand Down Expand Up @@ -201,7 +193,6 @@ resource "google_compute_region_health_check" "http-region-health-check" {

```hcl
resource "google_compute_region_health_check" "https-region-health-check" {
provider = google-beta
name = "https-region-health-check"
timeout_sec = 1
Expand All @@ -222,7 +213,6 @@ resource "google_compute_region_health_check" "https-region-health-check" {

```hcl
resource "google_compute_region_health_check" "https-region-health-check" {
provider = google-beta
name = "https-region-health-check"
description = "Health check via https"
Expand Down Expand Up @@ -251,7 +241,6 @@ resource "google_compute_region_health_check" "https-region-health-check" {

```hcl
resource "google_compute_region_health_check" "http2-region-health-check" {
provider = google-beta
name = "http2-region-health-check"
timeout_sec = 1
Expand All @@ -272,7 +261,6 @@ resource "google_compute_region_health_check" "http2-region-health-check" {

```hcl
resource "google_compute_region_health_check" "http2-region-health-check" {
provider = google-beta
name = "http2-region-health-check"
description = "Health check via http2"
Expand Down Expand Up @@ -620,10 +608,10 @@ This resource provides the following
RegionHealthCheck can be imported using any of these accepted formats:

```
$ terraform import -provider=google-beta google_compute_region_health_check.default projects/{{project}}/regions/{{region}}/healthChecks/{{name}}
$ terraform import -provider=google-beta google_compute_region_health_check.default {{project}}/{{region}}/{{name}}
$ terraform import -provider=google-beta google_compute_region_health_check.default {{region}}/{{name}}
$ terraform import -provider=google-beta google_compute_region_health_check.default {{name}}
$ terraform import google_compute_region_health_check.default projects/{{project}}/regions/{{region}}/healthChecks/{{name}}
$ terraform import google_compute_region_health_check.default {{project}}/{{region}}/{{name}}
$ terraform import google_compute_region_health_check.default {{region}}/{{name}}
$ terraform import google_compute_region_health_check.default {{name}}
```

-> If you're importing a resource with beta features, make sure to include `-provider=google-beta`
Expand Down

0 comments on commit f75b584

Please sign in to comment.