Skip to content

Commit 6548469

Browse files
Dataproc, container cluster, backend bucket test fixes (#4679) (#3150)
* ANACONDA is removed now * Remove telemetry pinned version, default cdn_cache fields in backen bucket * Ordering Signed-off-by: Modular Magician <[email protected]>
1 parent 06bbb15 commit 6548469

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.changelog/4679.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-beta/resource_compute_backend_bucket.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,20 @@ The possible values are: USE_ORIGIN_HEADERS, FORCE_CACHE_ALL and CACHE_ALL_STATI
7979
},
8080
"client_ttl": {
8181
Type: schema.TypeInt,
82+
Computed: true,
8283
Optional: true,
8384
Description: `Specifies the maximum allowed TTL for cached content served by this origin.`,
8485
},
8586
"default_ttl": {
8687
Type: schema.TypeInt,
88+
Computed: true,
8789
Optional: true,
8890
Description: `Specifies the default TTL for cached content served by this origin for responses
8991
that do not have an existing valid TTL (max-age or s-max-age).`,
9092
},
9193
"max_ttl": {
9294
Type: schema.TypeInt,
95+
Computed: true,
9396
Optional: true,
9497
Description: `Specifies the maximum allowed TTL for cached content served by this origin.`,
9598
},
@@ -123,6 +126,7 @@ can be specified as values, and you cannot specify a status code more than once.
123126
},
124127
"serve_while_stale": {
125128
Type: schema.TypeInt,
129+
Computed: true,
126130
Optional: true,
127131
Description: `Serve existing content from the cache (if available) when revalidating content with the origin, or when an error is encountered when refreshing the cache.`,
128132
},

google-beta/resource_container_cluster_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2738,7 +2738,6 @@ resource "google_container_cluster" "with_cluster_telemetry" {
27382738
name = "%s"
27392739
location = "us-central1-a"
27402740
initial_node_count = 1
2741-
min_master_version = "1.15"
27422741
27432742
cluster_telemetry {
27442743
type = "%s"

google-beta/resource_dataproc_cluster_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ func TestAccDataprocCluster_withOptionalComponents(t *testing.T) {
565565
Config: testAccDataprocCluster_withOptionalComponents(rnd),
566566
Check: resource.ComposeTestCheckFunc(
567567
testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.with_opt_components", &cluster),
568-
testAccCheckDataprocClusterHasOptionalComponents(&cluster, "ANACONDA", "ZOOKEEPER"),
568+
testAccCheckDataprocClusterHasOptionalComponents(&cluster, "ZOOKEEPER", "DOCKER"),
569569
),
570570
},
571571
},
@@ -1429,7 +1429,7 @@ resource "google_dataproc_cluster" "with_opt_components" {
14291429
14301430
cluster_config {
14311431
software_config {
1432-
optional_components = ["ANACONDA", "ZOOKEEPER"]
1432+
optional_components = ["DOCKER", "ZOOKEEPER"]
14331433
}
14341434
}
14351435
}

0 commit comments

Comments
 (0)