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

fix: upgrade hashicorp/google to 5.0 #259

Merged
merged 9 commits into from
Oct 9, 2023
Merged

fix: upgrade hashicorp/google to 5.0 #259

merged 9 commits into from
Oct 9, 2023

Conversation

LloydArmstrong
Copy link
Contributor

When trying to upgrade the hashicorp/google version to 5.0, the scheduled_queries submodule fails due to it's requirement of ~>4.0.

My familiarity with this specific submodule is not extensive and therefor, I'm not entirely sure of breaking changes. Please let me know if this is not support as of yet.

@LloydArmstrong LloydArmstrong requested review from davenportjw and a team as code owners October 4, 2023 12:50
@google-cla
Copy link

google-cla bot commented Oct 4, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@LloydArmstrong
Copy link
Contributor Author

Apologies, I jumped the gun with the MR. Reading through the contribution guidelines and will run test ASAP.

@LloydArmstrong
Copy link
Contributor Author

I realise this is a much bigger issue due to the dependancy on other Terraform Modules that have the same constraints, (even just within the testing module)

  • kms
  • project-factory

Even just to test this, it will require parallel MR's with the same versioning changes. It will require a concerted and synchronised effort between all modules involved

@LloydArmstrong LloydArmstrong changed the title Upgrade google to v5.0 for scheduled_queries Upgrade hashicorp/google to 5.0 Oct 4, 2023
apeabody
apeabody reviewed Oct 4, 2023
View reviewed changes
test/setup/versions.tf Outdated Show resolved Hide resolved
apeabody
apeabody reviewed Oct 4, 2023
View reviewed changes
test/setup/versions.tf Outdated Show resolved Hide resolved
apeabody
apeabody reviewed Oct 4, 2023
View reviewed changes
versions.tf Outdated Show resolved Hide resolved
apeabody
apeabody requested changes Oct 4, 2023
View reviewed changes
Copy link
Contributor

@apeabody apeabody left a comment

Choose a reason for hiding this comment

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

Thanks @LloydArmstrong! - We should avoid making this a breaking change by leaving the minimum version requirements intact and lifting the maximum.

@apeabody
Copy link
Contributor

apeabody commented Oct 5, 2023

/gcbrun

LloydArmstrong and others added 8 commits October 9, 2023 11:09
@LloydArmstrong LloydArmstrong force-pushed the hashicorp/google-Version-Dependancies-failing branch from 86e4f2f to 0038193 Compare October 9, 2023 09:10
@LloydArmstrong
Copy link
Contributor Author

LloydArmstrong commented Oct 9, 2023 •
edited
Loading

I've fixed the commit message convention used. Please take another look and let me know if any other changes are needed. Thanks.

@LloydArmstrong LloydArmstrong changed the title Upgrade hashicorp/google to 5.0 fix: upgrade hashicorp/google to 5.0 Oct 9, 2023
@apeabody
Copy link
Contributor

apeabody commented Oct 9, 2023

/gcbrun

@apeabody apeabody merged commit 096ca4e into terraform-google-modules:master Oct 9, 2023
4 checks passed
@release-please release-please bot mentioned this pull request Oct 9, 2023
Merged
msgongora added a commit to cbsi-dto/tf-mod-bq that referenced this pull request Oct 30, 2023
@msgongora
Squashed commit of the following:
fd67903 
commit f88f4b5
Author: Shane Glass <[email protected]>
Date:   Mon Oct 23 15:10:22 2023 -0400

    feat: data_warehouse Add GenAI capabilities  (terraform-google-modules#272)

commit b7efc4d
Author: Awais Malik <[email protected]>
Date:   Thu Oct 19 15:38:43 2023 -0700

    fix: adds a null check for expiration time (terraform-google-modules#268)

commit 405972a
Author: Shane Glass <[email protected]>
Date:   Tue Oct 17 17:03:10 2023 -0400

    fix: update workflow.tftpl (terraform-google-modules#266)

commit 1046e0d
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Oct 17 09:29:48 2023 -0700

    chore(deps): update cft/developer-tools docker tag to v1.17 (terraform-google-modules#265)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit ceef798
Author: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Date:   Tue Oct 17 09:48:20 2023 -0600

    chore(master): release 7.0.0 (terraform-google-modules#249)

commit 1a7620b
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Oct 10 09:11:32 2023 -0700

    chore(deps): Update module github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test to v0.9.0 (terraform-google-modules#260)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 7fd5bcb
Author: Awais Malik <[email protected]>
Date:   Mon Oct 9 14:33:52 2023 -0700

    fix: upgraded versions.tf to include minor bumps from tpg v5 (terraform-google-modules#261)

    Co-authored-by: Andrew Peabody <[email protected]>
    Co-authored-by: Jason Davenport <[email protected]>

commit e97adfb
Author: Shane Glass <[email protected]>
Date:   Mon Oct 9 15:27:46 2023 -0400

    feat!: data_warehosue migrating to TheLook Ecommerce dataset (terraform-google-modules#257)

commit 096ca4e
Author: Lloyd Armstrong <[email protected]>
Date:   Mon Oct 9 18:28:35 2023 +0200

    fix: upgrade hashicorp/google to 5.0 (terraform-google-modules#259)

    Co-authored-by: Lloyd Armstrong <[email protected]>
msgongora added a commit to cbsi-dto/tf-mod-bq that referenced this pull request Oct 30, 2023
@msgongora
chore: sync main-cbsi with upstream/master
b72b6e1 
Squashed commit of the following:

commit f88f4b5
Author: Shane Glass <[email protected]>
Date:   Mon Oct 23 15:10:22 2023 -0400

    feat: data_warehouse Add GenAI capabilities  (terraform-google-modules#272)

commit b7efc4d
Author: Awais Malik <[email protected]>
Date:   Thu Oct 19 15:38:43 2023 -0700

    fix: adds a null check for expiration time (terraform-google-modules#268)

commit 405972a
Author: Shane Glass <[email protected]>
Date:   Tue Oct 17 17:03:10 2023 -0400

    fix: update workflow.tftpl (terraform-google-modules#266)

commit 1046e0d
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Oct 17 09:29:48 2023 -0700

    chore(deps): update cft/developer-tools docker tag to v1.17 (terraform-google-modules#265)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit ceef798
Author: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Date:   Tue Oct 17 09:48:20 2023 -0600

    chore(master): release 7.0.0 (terraform-google-modules#249)

commit 1a7620b
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Oct 10 09:11:32 2023 -0700

    chore(deps): Update module github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test to v0.9.0 (terraform-google-modules#260)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 7fd5bcb
Author: Awais Malik <[email protected]>
Date:   Mon Oct 9 14:33:52 2023 -0700

    fix: upgraded versions.tf to include minor bumps from tpg v5 (terraform-google-modules#261)

    Co-authored-by: Andrew Peabody <[email protected]>
    Co-authored-by: Jason Davenport <[email protected]>

commit e97adfb
Author: Shane Glass <[email protected]>
Date:   Mon Oct 9 15:27:46 2023 -0400

    feat!: data_warehosue migrating to TheLook Ecommerce dataset (terraform-google-modules#257)

commit 096ca4e
Author: Lloyd Armstrong <[email protected]>
Date:   Mon Oct 9 18:28:35 2023 +0200

    fix: upgrade hashicorp/google to 5.0 (terraform-google-modules#259)

    Co-authored-by: Lloyd Armstrong <[email protected]>
msgongora pushed a commit to cbsi-dto/tf-mod-bq that referenced this pull request Oct 30, 2023
@LloydArmstrong @msgongora
fix: upgrade hashicorp/google to 5.0 (terraform-google-modules#259)
462da06 
Co-authored-by: Lloyd Armstrong <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apeabody apeabody apeabody approved these changes

@davenportjw davenportjw Awaiting requested review from davenportjw davenportjw is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@LloydArmstrong @apeabody @cloud-foundation-bot