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

Generate DefaultObjectAccessControl in Terraform #630

Merged

Conversation

rileykarson
Copy link
Member

Also add OiCS to ObjectAccessControl.


[all]

Update DefaultObjectAccessControl properties

[terraform]

Generate DefaultObjectAccessControl in Terraform

[terraform-beta]

[ansible]

[inspec]

provider/terraform/custom_code.rb Outdated Show resolved Hide resolved
@@ -146,11 +146,13 @@ def oics_link
end

def substitute_test_paths(config)
config = config.gsub('../static/img/header-logo.png', 'test-fixtures/header-logo.png')
Copy link
Contributor

Choose a reason for hiding this comment

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

Why does the png need to be checked into source control?

Copy link
Member Author

Choose a reason for hiding this comment

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

We need something to send up to our bucket, and I prefer sending "real" files up to just generating the file at test time. We already have a few static files for ssl certs and cloud functions, so I figure this image can be too.

Copy link
Contributor

Choose a reason for hiding this comment

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

As long as we keep the file sizes small and don't change them much it shouldn't be a big deal. Big or frequently changing binary files make git sad.

Copy link
Member Author

Choose a reason for hiding this comment

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

oh yup it is a 16x16 grey image very much on purpose haha. imo tossing 1-2 small images into vcs is fine, if it were any more/any larger it would 100% be time for a more future-proof solution

rileykarson added a commit to hashicorp/terraform-provider-google that referenced this pull request Oct 29, 2018
blocking GoogleCloudPlatform/magic-modules#630

This resource won't be tested between this merging and the MM pr merging
@rileykarson rileykarson force-pushed the default-object-access branch 2 times, most recently from cfa0efb to aabd95b Compare October 29, 2018 22:03
@modular-magician
Copy link
Collaborator

I am a robot that works on MagicModules PRs!

I built this PR into one or more PRs on other repositories, and when those are closed, this PR will also be merged and closed.
depends: hashicorp/terraform-provider-google-beta#58
depends: hashicorp/terraform-provider-google#2358

@rileykarson rileykarson force-pushed the default-object-access branch from ca3cf79 to 41d1fd5 Compare October 30, 2018 00:49
@modular-magician
Copy link
Collaborator

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit 3616c0a) have been included in your existing downstream PRs.

@modular-magician
Copy link
Collaborator

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit 62167f1) have been included in your existing downstream PRs.

Tracked submodules are build/terraform-beta build/terraform build/ansible build/inspec.
@modular-magician modular-magician merged commit 274b875 into GoogleCloudPlatform:master Oct 30, 2018
nat-henderson pushed a commit to hashicorp/terraform-provider-google that referenced this pull request Dec 4, 2018
blocking GoogleCloudPlatform/magic-modules#630

This resource won't be tested between this merging and the MM pr merging
nat-henderson pushed a commit to hashicorp/terraform-provider-google that referenced this pull request Dec 5, 2018
blocking GoogleCloudPlatform/magic-modules#630

This resource won't be tested between this merging and the MM pr merging
nat-henderson pushed a commit to hashicorp/terraform-provider-google that referenced this pull request Dec 6, 2018
blocking GoogleCloudPlatform/magic-modules#630

This resource won't be tested between this merging and the MM pr merging
nat-henderson pushed a commit to hashicorp/terraform-provider-google that referenced this pull request Dec 13, 2018
blocking GoogleCloudPlatform/magic-modules#630

This resource won't be tested between this merging and the MM pr merging
nat-henderson pushed a commit to hashicorp/terraform-provider-google that referenced this pull request Dec 21, 2018
blocking GoogleCloudPlatform/magic-modules#630

This resource won't be tested between this merging and the MM pr merging
nat-henderson pushed a commit to hashicorp/terraform-provider-google that referenced this pull request Dec 21, 2018
blocking GoogleCloudPlatform/magic-modules#630

This resource won't be tested between this merging and the MM pr merging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants