-
Notifications
You must be signed in to change notification settings - Fork 883
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
Allow duplicate file names in project hierarchy #2661
Open
robrankin
wants to merge
4
commits into
GoogleCloudPlatform:master
Choose a base branch
from
robrankin:robrankin/allow_dupe_project_files_in_hierarchy
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+86
−1
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
43 changes: 43 additions & 0 deletions
43
fast/stages/2-project-factory/data/hierarchy/team-a/dev/ce-0.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# yaml-language-server: $schema=../../schemas/project.schema.json | ||
|
||
name: ta-d-ce-0 | ||
iam: | ||
roles/owner: | ||
# refer to the rw service account defined below | ||
- rw | ||
roles/viewer: | ||
# refer to the ro service account defined below | ||
- ro | ||
automation: | ||
# no context is possible here | ||
# use the complete project id | ||
project: xxx-iac-pf-0 | ||
service_accounts: | ||
rw: | ||
description: Read/write automation sa for team a dev ce. | ||
ro: | ||
description: Read-only automation sa for team a dev ce. | ||
buckets: | ||
state: | ||
description: Terraform state bucket for team a dev ce. | ||
iam: | ||
roles/storage.objectCreator: | ||
- rw | ||
roles/storage.objectViewer: | ||
- rw | ||
- ro | ||
- group:[email protected] |
42 changes: 42 additions & 0 deletions
42
fast/stages/2-project-factory/data/hierarchy/team-b/dev/ce-0.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# yaml-language-server: $schema=../../schemas/project.schema.json | ||
|
||
iam: | ||
roles/owner: | ||
# refer to the rw service account defined below | ||
- rw | ||
roles/viewer: | ||
# refer to the ro service account defined below | ||
- ro | ||
automation: | ||
# no context is possible here | ||
# use the complete project id | ||
project: xxx-iac-pf-0 | ||
service_accounts: | ||
rw: | ||
description: Read/write automation sa for team a dev ce. | ||
ro: | ||
description: Read-only automation sa for team a dev ce. | ||
buckets: | ||
state: | ||
description: Terraform state bucket for team b dev ce. | ||
iam: | ||
roles/storage.objectCreator: | ||
- rw | ||
roles/storage.objectViewer: | ||
- rw | ||
- ro | ||
- group:[email protected] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer having the
/
being part of the key, to make it clear which part is the hierarchy and which is the project. Keep in mind the primary use case is using the key in substitutions (e.g.automation.project = "foo/bar"
). Let's keep the path intact, and then find a way to map that to project ids. Probably by moving thereplace
there.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you comment on this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the problem (I think) is that '/' is invalid in project ids
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to keep the path for keys, not project ids