Skip to content

Commit ef55381

Browse files
Bump Composer Version in Tests (#12598) (#20770)
[upstream:4e4da0c52b8f679d7958035a38779b743f3d475e] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 5aa34ab commit ef55381

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.changelog/12598.txt

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

google/services/composer/resource_composer_environment_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,10 @@ func TestAccComposerEnvironment_UpdateComposerV2ImageVersion(t *testing.T) {
429429
CheckDestroy: testAccComposerEnvironmentDestroyProducer(t),
430430
Steps: []resource.TestStep{
431431
{
432-
Config: testAccComposerEnvironment_composerV250(envName, network, subnetwork),
432+
Config: testAccComposerEnvironment_composerOldVersion(envName, network, subnetwork),
433433
},
434434
{
435-
Config: testAccComposerEnvironment_composerV260(envName, network, subnetwork),
435+
Config: testAccComposerEnvironment_composerNewVersion(envName, network, subnetwork),
436436
},
437437
{
438438
ResourceName: "google_composer_environment.test",
@@ -445,7 +445,7 @@ func TestAccComposerEnvironment_UpdateComposerV2ImageVersion(t *testing.T) {
445445
{
446446
PlanOnly: true,
447447
ExpectNonEmptyPlan: false,
448-
Config: testAccComposerEnvironment_composerV260(envName, network, subnetwork),
448+
Config: testAccComposerEnvironment_composerNewVersion(envName, network, subnetwork),
449449
Check: testAccCheckClearComposerEnvironmentFirewalls(t, network),
450450
},
451451
},
@@ -1483,7 +1483,7 @@ resource "google_composer_environment" "test" {
14831483
}
14841484
}
14851485
software_config {
1486-
image_version = "composer-2.4.2-airflow-2"
1486+
image_version = "composer-2-airflow-2"
14871487
}
14881488
}
14891489
storage_config {
@@ -1524,7 +1524,7 @@ resource "google_composer_environment" "test" {
15241524
subnetwork = google_compute_subnetwork.test.self_link
15251525
}
15261526
software_config {
1527-
image_version = "composer-2.9.3-airflow-2.9.1"
1527+
image_version = "composer-2-airflow-2"
15281528
}
15291529
}
15301530
storage_config {
@@ -2107,7 +2107,7 @@ resource "google_compute_subnetwork" "test" {
21072107
`, envName, network, subnetwork)
21082108
}
21092109

2110-
func testAccComposerEnvironment_composerV250(envName, network, subnetwork string) string {
2110+
func testAccComposerEnvironment_composerOldVersion(envName, network, subnetwork string) string {
21112111
return fmt.Sprintf(`
21122112
resource "google_composer_environment" "test" {
21132113
name = "%s"
@@ -2120,7 +2120,7 @@ resource "google_composer_environment" "test" {
21202120
}
21212121
21222122
software_config {
2123-
image_version = "composer-2.5.0-airflow-2.6.3"
2123+
image_version = "composer-2.10.0-airflow-2.10.2"
21242124
}
21252125
}
21262126
}
@@ -2141,7 +2141,7 @@ resource "google_compute_subnetwork" "test" {
21412141
`, envName, network, subnetwork)
21422142
}
21432143

2144-
func testAccComposerEnvironment_composerV260(envName, network, subnetwork string) string {
2144+
func testAccComposerEnvironment_composerNewVersion(envName, network, subnetwork string) string {
21452145
return fmt.Sprintf(`
21462146
resource "google_composer_environment" "test" {
21472147
name = "%s"
@@ -2154,7 +2154,7 @@ resource "google_composer_environment" "test" {
21542154
}
21552155
21562156
software_config {
2157-
image_version = "composer-2.6.0-airflow-2.6.3"
2157+
image_version = "composer-2.10.1-airflow-2.10.2"
21582158
}
21592159
}
21602160
}

0 commit comments

Comments
 (0)