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

requireAdminApproval/requireCorpOwned in AccessLevel's devicePolicy #2710

Merged
merged 2 commits into from
Nov 18, 2019
Merged

requireAdminApproval/requireCorpOwned in AccessLevel's devicePolicy #2710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e99a30c
device approval/corp owned in acess level
drebes Nov 16, 2019
00c3474
Update tracked submodules -> HEAD on Mon Nov 18 18:36:11 UTC 2019
modular-magician Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from b69bcd to 2a828f
2 changes: 1 addition & 1 deletion build/terraform-beta
Open in desktop
Submodule terraform-beta updated from c48852 to 9b2712
2 changes: 1 addition & 1 deletion build/terraform-mapper
Open in desktop
Submodule terraform-mapper updated 2 files
+22 −0 google/accesscontextmanager_access_level.go
+8 −0 google/self_link_helpers.go
8 changes: 8 additions & 0 deletions products/accesscontextmanager/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,14 @@ objects:
- :DESKTOP_WINDOWS
- :DESKTOP_LINUX
- :DESKTOP_CHROME_OS
- !ruby/object:Api::Type::Boolean
name: 'requireAdminApproval'
description: |
Whether the device needs to be approved by the customer admin.
- !ruby/object:Api::Type::Boolean
name: 'requireCorpOwned'
description: |
Whether the device needs to be corp owned.
- !ruby/object:Api::Resource
name: 'ServicePerimeter'
# This is an unusual API, so we need to use a few fields to map the methods
Expand Down
2 changes: 2 additions & 0 deletions third_party/terraform/tests/resource_access_context_manager_access_level_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ resource "google_access_context_manager_access_level" "test-access" {
negate = false
device_policy {
require_screen_lock = false
require_admin_approval = false
require_corp_owned = true
os_constraints {
os_type = "DESKTOP_CHROME_OS"
}
Expand Down