Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 6.0 into main #8013

Merged
merged 48 commits into from
Aug 21, 2024
Merged

Merge 6.0 into main #8013

merged 48 commits into from
Aug 21, 2024

Conversation

c2thorn
Copy link
Collaborator

@c2thorn c2thorn commented Aug 21, 2024

No description provided.

@modular-magician
Merge pull request #11023 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
64ef9df 
…#7618)

Sync main feature branch 6.0.0

[upstream:22e1ca94afba382c6bfd496d8d1bbfb76782182b]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Merge pull request #11088 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
fa24f23 
…#7673)

Sync main feature branch 6.0.0 - 7/1

[upstream:a8fd8256a904bb9e360547dfc96a9e01a1ff9584]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
fix: Allow Pub/Sub Topic update to remove schema settings (#11038) (#…
42927d0 
…7674)

[upstream:0c8818e960cc3711b491bcb535ab0cf8ee7e0531]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Merge pull request #11126 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
cff59bc 
…#7700)

Sync main feature branch 6.0.0 - 7/9

[upstream:4271d4af13062044666cb0e4907a2b88d07792a1]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Fix permadiff on google_vpc_access_connector resource with breaking c…
d0f576d 
…hanges (min_instances, max_instances, min_throughput, max_throughput fields) (#10313) (#7709)

[upstream:f8834bc45fcf94b05c0e6f7de2dcf8003e6d7745]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
TGC: Fix test failure example_vpc_access_connector (#11135) (#7720)
75a0b1b 
[upstream:5bc78ca2d1da0eebb8017da821f6dbb35cd14a04]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Update backend service default values (#11117) (#7723)
e7cf067 
[upstream:edcfedd9dfcc7515544c815a6e23795e12697f64]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Merge pull request #11179 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
82913a6 
…#7752)

Sync main feature branch 6.0.0 - 7/16

[upstream:4b86cb21f180699aa01ab9cea21812bd58c46815]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove default_from_api from liveness_probe field in Cloud Run v2…
e4257f1 
… service (#11190) (#7753)

[upstream:1d3de8b021dd519222961bc4f7d37b2b90fb4a50]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Add validation to prevent BigQuery view from creation when input sche…
c1cdf12 
…ma contains required fields (#11101) (#7755)

[upstream:1d43e02fe8cbee792dc721792a3ed7dd3cfdde67]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove default addition of IAP message in encoder and decoder, add ne…
c6b8e94 
…w required `enabled` field and remove the previous required tags under IAP message for resource google_compute_backend_service and resource google_compute_region_backend_service (#9581) (#7758)

[upstream:29ded33d5a7572d047d6870518b7840f026fec02]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Fix version_6_upgrade.html.markdown (#11209) (#7779)
55d8ca2 
[upstream:d49eb280fc75989458a918fe313ff27a1ea9727c]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Update resource id for ProjectInfo (#11226) (#7793)
2cacd5b 
[upstream:9941087dbb0a889b189e06558c067e0ca2c96944]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Merge pull request #11237 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
70c9ce2 
…#7800)

Sync main feature branch 6.0.0 - 7/23

[upstream:fa001dc2531704f19fd9302667a8a26672d9c30b]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Deprecate google_sql_database_instance.settings.ip_configuration's re…
edd5e59 
…quire_ssl in favor of ssl_mode (#11154) (#7804)

[upstream:bc7cde468a0c1c8ec3addac9b63479f743c218b9]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Update Resource id for Compute_network_endpoints (#11240) (#7806)
9fcc29d 
[upstream:578efcf435f89758e1927218e730d872acedd36d]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Make cloudrunv2 containers' env a set (#11199) (#7812)
dd55066 
[upstream:a33654d57d620bb7a07e2a79e6b1c01ddfa2326d]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Add deletion_protection field to CloudAD domain resource (#11256) (#7837
840f5a6 
)

[upstream:b65acdbf82db72e3f15eba2c628c2009140b8334]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove multi_region_auxiliary from google_bigquery_reservation (#…
ae32bf7 
…11304) (#7844)

[upstream:b5f859fc1750ac1f250d540a7ad9d0af45c4370b]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Merge pull request #11329 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
0957d01 
…#7874)

Sync main feature branch 6.0.0 - 8/1

[upstream:fbc112198a367d09d738214dbe1f87cc05a6e7c2]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove resource google_identity_platform_project_default_config (#113…
96864dd 
…54) (#7880)

[upstream:40c0cc6e886a26cbaa9a4bf9556c79eabafc7f4c]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Add deletion_protection to v2 cloud run service resource (#11318) (#7901
bd71dbe 
)

[upstream:1c7aa4de79d54b48b5e81cab86661d3db582625b]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Add deletion_protection field to Folders resource (#11293) (#7903)
794d80a 
[upstream:a31848e911392a82ae25e89c4bac87c6275541fc]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Removes no_age from google_storage_bucket resource. (#11356) (#7923)
d206144 
[upstream:6106c3313c4d4eedd5b3b3c2d5e645ee0dbfd9f7]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove relay_mode field support (#10274) (#7930)
306a821 
[upstream:4f39da51c0464ab867e96abba3168d78841a86e1]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Apply new labels model to container cluster and edgenetwork resources…
6ea333c 
… (#11320) (#7932)

[upstream:75ce1f6be87e643cfb7f0db0c3a435d7b7b4a12e]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Merge pull request #11400 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
b44d6e9 
…#7935)

Sync main feature branch 6.0.0 - 8/8

[upstream:a760a0bc1ff267d2dfbdb85b660707ce3adabd15]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove default_from_api from certificateId field (#11409) (#7936)
a1d20b1 
[upstream:974c2f97ec389518f88ec036e8512ed51f1b8967]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove allow_resource_tags_on_deletion from google_bigquery_table (#1…
d064e29 
…1393) (#7940)

[upstream:7ce4e153a23c217c3e424936cb8f2f673da41b62]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Set disbaleSsh default value to true for workstation create (#11225) (#…
f262963 
…7946)

[upstream:f1026bb86e56a759df42d1877d46e4b366be8247]

Signed-off-by: Modular Magician <[email protected]>
modular-magician and others added 16 commits August 13, 2024 08:57
@modular-magician
Make deletion_policy field for Project resource PREVENT by default …
67547a5 
…(#11255) (#7955)

[upstream:9905a08d80a5fc0bc137ae2cb06bac27e29678ac]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Fix tgc unit test (#11434) (#7967)
d25a10f 
[upstream:2f02fec0584f94f301042189e61d8a498b46d948]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
remove deprecated integration client fields (#11450) (#7977)
66c1262 
[upstream:e4cf2c3e88551d570c183ef6451a63d1ee925cfc]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Breaking change - Add integration for subnetworks with internal range…
8e7d14a 
…s API (#10897) (#7980)

[upstream:cb56491a4cbb5453b0ba4f784f3fdb04831376f5]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
reduce name prefix in compute resources (#11448) (#7981)
3dbd5ab 
[upstream:ce440583cb42cfef57c0271cead35f41f3374d9f]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove references to deprecated google_datastore_index feature. (#1…
8b5d58d 
…1457) (#7987)

[upstream:de5e533e630c838317c93107d9bb242403fddeaa]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove project dependency from TestAccApikeysKey_* (#11462) (#7989)
f14e2c8 
[upstream:372b7c7f15383798536573ebe662c099ac2819d1]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
add state upgrader to set send_age_if_zero virtual field default to f…
651e313 
…alse (#11471) (#7993)

[upstream:dde0ea57bc547947ab7debe282fd06344cf86c72]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Add DeletionProtectionEnabled to Redis Cluster (#10367) (#7995)
6ccc989 
[upstream:820e403355ea94ddbf666b9327231eb35bbfd5d8]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Removed datastore from TeamCity service list (#11489) (#7997)
c28588a 
[upstream:f02f86cb5dbffe17366064d550c5c96001a53808]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove network in google_alloydb_cluster (#11460) (#7999)
2059bb4 
[upstream:b00ae4cbecdb41c147382576338422b02046947a]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Enable goog-terraform-provisioned provider label (#11439) (#8004)
0ac8343 
[upstream:0b62ec98517816a68148f8284a941b57ad21b4d4]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Merge pull request #11499 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
04b789c 
…#8007)

Sync main feature branch 6.0.0 - 8/20

[upstream:5e11f505141cbb2581f1c5cf330af01e3ad0465b]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Remove SchemaConfigModeAttr (#11506) (#8011)
e376147 
[upstream:93bcf85b934cdfdc5d45ae2f876118ab8dd8d3e9]

Signed-off-by: Modular Magician <[email protected]>
@modular-magician
Merge pull request #11513 from c2thorn/sync-main-FEATURE-BRANCH-6.0.0 (…
3e09a69 
…#8012)

Sync main feature branch 6.0.0 - 8/21

[upstream:5041f537b74e607bc605f1fc5cb1b89f428f2a6f]

Signed-off-by: Modular Magician <[email protected]>
@c2thorn
Merge 6.0 branch into main
47b37d5 
from commit '3e09a697a4c27f025affe9916c9e821a7428f752'
@github-actions GitHub Actions
Copy link

** WARNING **: This repository is generated by https://github.com/GoogleCloudPlatform/magic-modules. Any changes made directly to this repository will likely be overwritten. If you have further questions, please feel free to ping your reviewer or, internal employees, reach out to one of the engineers. Thank you!

@c2thorn c2thorn requested a review from shuyama1 August 21, 2024 20:37
shuyama1
shuyama1 approved these changes Aug 21, 2024
View reviewed changes
Copy link
Collaborator

@shuyama1 shuyama1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Don't forget to commit merge!

@shuyama1 shuyama1 merged commit 450d076 into main Aug 21, 2024
2 checks passed
@shuyama1 shuyama1 deleted the merge-6.0-into-main branch August 21, 2024 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shuyama1 shuyama1 shuyama1 approved these changes

@slevenick slevenick Awaiting requested review from slevenick

Assignees
No one assigned
Labels
size/xl
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@c2thorn @shuyama1 @modular-magician