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.

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

feat!: migrating to TheLook Ecommerce dataset #257

Conversation

shanecglass
Copy link
Contributor

No description provided.

@shanecglass shanecglass requested a review from a team as a code owner October 2, 2023 15:13
@shanecglass shanecglass changed the title Merging deconflicted changes feat!: migrating to TheLook Ecommerce dataset Oct 2, 2023
Copy link
Collaborator

@davenportjw davenportjw left a comment

Choose a reason for hiding this comment

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

good start! a few things around dependencies and what the linter will dislike to resolve.


labels = var.labels

depends_on = [
Copy link
Collaborator

Choose a reason for hiding this comment

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

we can remove these since the solution calls out the resources specifically above (applies to other tables below).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Cleaned up these dependencies, as well as those across all .tf files

table_id = "events"
project = module.project-services.project_id
deletion_protection = var.deletion_protection
# max_staleness = "1:0:0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

if we arent planning to use these, I'd probably just remove them to keep the code simple.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I kept them in here because I thought it would be good for folks to see the syntax, but commented them out so that the Looker Studio report works immediately.

modules/data_warehouse/bigquery.tf Show resolved Hide resolved
@@ -182,6 +305,8 @@ resource "google_project_iam_member" "dts_roles" {
project = module.project-services.project_id
role = each.key
member = "serviceAccount:${google_service_account.dts.email}"

depends_on = [google_service_account.dts]
Copy link
Collaborator

Choose a reason for hiding this comment

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

this one isnt needed since you have an output attribute of DTS resource on 307

)
GROUP BY user_id
)
);
Copy link
Collaborator

Choose a reason for hiding this comment

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

add new lines

@@ -39,13 +39,13 @@ variable "enable_apis" {
variable "force_destroy" {
type = string
description = "Whether or not to protect BigQuery resources from deletion when solution is modified or changed."
default = false
default = true
Copy link
Collaborator

Choose a reason for hiding this comment

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

we set these to the non-destructive option by default in the code (we override them in Solution Deployment)

}

variable "deletion_protection" {
type = string
description = "Whether or not to protect GCS resources from deletion when solution is modified or changed."
default = true
default = false
Copy link
Collaborator

Choose a reason for hiding this comment

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

same as above.

project = module.project-services.project_id
role = each.key
member = "serviceAccount:${google_service_account.workflow_service_account.email}"


depends_on = [google_service_account.workflow_service_account]
Copy link
Collaborator

Choose a reason for hiding this comment

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

not needed.

@davenportjw
Copy link
Collaborator

davenportjw commented Oct 5, 2023 via email

@davenportjw
Copy link
Collaborator

/gcbrun

@davenportjw
Copy link
Collaborator

/gcbrun

1 similar comment
@davenportjw
Copy link
Collaborator

/gcbrun

@davenportjw
Copy link
Collaborator

/gcbrun

@davenportjw
Copy link
Collaborator

/gcbrun

1 similar comment
@davenportjw
Copy link
Collaborator

/gcbrun

@davenportjw davenportjw merged commit e97adfb into terraform-google-modules:master Oct 9, 2023
4 checks passed
@shanecglass shanecglass deleted the terraform-google-modules-master branch October 9, 2023 20:02
@shanecglass shanecglass restored the terraform-google-modules-master branch October 9, 2023 20:02
@shanecglass shanecglass deleted the terraform-google-modules-master branch October 9, 2023 20:03
msgongora added a commit to cbsi-dto/tf-mod-bq that referenced this pull request Oct 30, 2023
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
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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants