Skip to content

Commit 5c43687

Browse files
Update dataproc image version past log4j (#5919) (#4211)
Signed-off-by: Modular Magician <[email protected]>
1 parent a5ca2ec commit 5c43687

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.changelog/5919.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
```release-note:none
2+
```

google-beta/resource_dataproc_cluster_test.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -558,17 +558,19 @@ func TestAccDataprocCluster_withImageVersion(t *testing.T) {
558558
t.Parallel()
559559

560560
rnd := randString(t, 10)
561+
version := "2.0-debian10"
562+
561563
var cluster dataproc.Cluster
562564
vcrTest(t, resource.TestCase{
563565
PreCheck: func() { testAccPreCheck(t) },
564566
Providers: testAccProviders,
565567
CheckDestroy: testAccCheckDataprocClusterDestroy(t),
566568
Steps: []resource.TestStep{
567569
{
568-
Config: testAccDataprocCluster_withImageVersion(rnd),
570+
Config: testAccDataprocCluster_withImageVersion(rnd, version),
569571
Check: resource.ComposeTestCheckFunc(
570572
testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.with_image_version", &cluster),
571-
resource.TestCheckResourceAttr("google_dataproc_cluster.with_image_version", "cluster_config.0.software_config.0.image_version", "1.3.7-deb9"),
573+
resource.TestCheckResourceAttr("google_dataproc_cluster.with_image_version", "cluster_config.0.software_config.0.image_version", version),
572574
),
573575
},
574576
},
@@ -1493,19 +1495,19 @@ resource "google_dataproc_cluster" "with_endpoint_config" {
14931495
`, rnd)
14941496
}
14951497

1496-
func testAccDataprocCluster_withImageVersion(rnd string) string {
1498+
func testAccDataprocCluster_withImageVersion(rnd, version string) string {
14971499
return fmt.Sprintf(`
14981500
resource "google_dataproc_cluster" "with_image_version" {
14991501
name = "tf-test-dproc-%s"
15001502
region = "us-central1"
15011503
15021504
cluster_config {
15031505
software_config {
1504-
image_version = "1.3.7-deb9"
1506+
image_version = "%s"
15051507
}
15061508
}
15071509
}
1508-
`, rnd)
1510+
`, rnd, version)
15091511
}
15101512

15111513
func testAccDataprocCluster_withOptionalComponents(rnd string) string {

0 commit comments

Comments
 (0)